mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00

commit fc4b42b1d56f95efeb1b9fe42dc35b7d98d246bb Merge: 74516c7 9eb1413 Author: John Bowler <jbowler@acm.org> Date: Sun Nov 22 19:37:54 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit 74516c7257f1a28a69985684c5673caa390c700a Author: John Bowler <jbowler@acm.org> Date: Sun Nov 22 19:32:43 2015 -0800 Make check full pass on gcc/g++ x86_64 Signed-off-by: John Bowler <jbowler@acm.org> commit e891e34737fc0bc9ee873a5d56b83c1e777b990c Author: John Bowler <jbowler@acm.org> Date: Sun Nov 22 12:01:37 2015 -0800 Checkpoint: write buffering changes This version fails in pngvalid --size because of an error handling very narrow images, otherwise a standard build passes make check. Signed-off-by: John Bowler <jbowler@acm.org> commit 457a046ebdab737eefb477126cf855e49df6de50 Author: John Bowler <jbowler@acm.org> Date: Sun Nov 22 06:39:36 2015 -0800 Fix previous bad merge commit b4f426c97267317637d43f41fe0b05d1659bc63d Merge: 07b9b90 a3458a6 Author: John Bowler <jbowler@acm.org> Date: Sun Nov 22 06:32:34 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit 07b9b90dfd653b744dbc3710b096facf6b4605f6 Merge: ed43306 5592e0b Author: John Bowler <jbowler@acm.org> Date: Sat Nov 21 17:07:23 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit ed43306599f7039a90187862db82273fca3a4c3d Merge: 772aed7 d3c0359 Author: John Bowler <jbowler@acm.org> Date: Tue Nov 17 17:47:26 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit 772aed72378df9c8fccc5a4594b095d02d410a9c Merge: 73ae431 801608f Author: John Bowler <jbowler@acm.org> Date: Mon Nov 16 14:26:38 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit 73ae4316cb6db7d7f6756583a1c213c35ca4e3f4 Merge: 687e6e3 c09b3ab Author: John Bowler <jbowler@acm.org> Date: Sun Nov 15 09:31:30 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit 687e6e393e9d0220c2a12ec474aa01b83c5e9f25 Merge: fedd6da e916d9b Author: John Bowler <jbowler@acm.org> Date: Thu Nov 5 08:45:14 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit fedd6da8798a14b2e002b0bc1379f5a09a03598a Merge: 2e2fc5f ea41fd2 Author: John Bowler <jbowler@acm.org> Date: Tue Nov 3 21:05:01 2015 -0800 Merge branch 'libpng17' into libpng17-filter-enhancements commit 2e2fc5f6d7678b710c52b7ea081ac4add677d8d5 Merge: 990d5f8 5b05197 Author: John Bowler <jbowler@acm.org> Date: Mon Oct 12 08:28:30 2015 -0700 Merge branch 'libpng17' into libpng17-filter-enhancements commit 990d5f88688635dc0888657b689e30ffe7e7a7b3 Author: John Bowler <jbowler@acm.org> Date: Sun Oct 4 17:04:53 2015 -0700 Read row buffer changes The read code now allocates one row buffer of the size of the input PNG row and, only if required, one buffer of the size of the output. The output buffer is required for the progressive reader (always) and for the sequential reader if libpng is de-interlacing an image (because the output row is used multiple times if png_read_row is called with a display row parameter.) This should reduce memory utilization by libpng significantly, but it has no detectable effect on overall performance figures of the test programs, these are probably dominated by memory allocations for the whole image within the test programs. Signed-off-by: John Bowler <jbowler@acm.org> commit 527bf989bf0e30440f9e07a5544a6ebb1d6fd039 Merge: 50ebbc2 9099254 Author: John Bowler <jbowler@acm.org> Date: Sat Oct 3 13:39:17 2015 -0700 Merge branch 'libpng17' into libpng17-filter-enhancements commit 50ebbc2c9a24cf1a6b428db53d55fbd5af4d6be6 Merge: 21a7f40 2cd6d56 Author: John Bowler <jbowler@acm.org> Date: Sat Oct 3 11:16:32 2015 -0700 Merge branch 'libpng17' into libpng17-filter-enhancements commit 21a7f401ab40c79ead9e35882a8066e2cf1d6902 Merge: b512e1c 15a143e Author: John Bowler <jbowler@acm.org> Date: Wed Sep 30 19:01:23 2015 -0700 Merge branch 'libpng17' into libpng17-filter-enhancements commit b512e1c2c5bfe6df8b6dca32f862d325ec22115e Author: John Bowler <jbowler@acm.org> Date: Wed Sep 30 17:33:34 2015 -0700 Transform rewrite: perform transforms in small chunks The intent of this change is to reduce the memory footprint during transform sequences by performing transforms in fixed (small) sized blocks of pixels. The change is incomplete; the filter code still works row-by-row, so the whole tranform also works row-by-row, the intent is to fix this so that everything works in small(ish) chunks. At present the change has no discernable effect on pngvalid --speed or pngstest with (e.g.) rgb-8-1.8.png; user time and (minor) page faults are the same in old and new versions. The same applies to real-world 15MP PNG images; even on these the presence of the filter code causes a cyclical progress through memory which will interfere with any caching otherwise possible (useful word, 'otherwise'.) Signed-off-by: John Bowler <jbowler@acm.org> commit 781cb3699b92beb0e6bc5e03cef8fba820267082 Author: John Bowler <jbowler@acm.org> Date: Wed Sep 30 17:12:53 2015 -0700 Fix NO_WRITE_INTERLACE in pngvalid.c The support for writing interlaced images directly from libpng 1.7 was unintentionally disabled (INTERLACE_LAST was defined incorrectly, excluding the interlaced images). This obscured the fact that the transform and error test case generators lacked the support for writing interlaced images from libpng. Signed-off-by: John Bowler <jbowler@acm.org> commit 406ee2fd7946a384f1d7713712dc646080c5c52c Author: John Bowler <jbowler@acm.org> Date: Wed Sep 30 17:11:40 2015 -0700 Add pngvalid --transform --interlace test This increases code coverage by generating test cases with smaller length rows as a result of the interlacing. Without this packswap handling was incompletely tested. Signed-off-by: John Bowler <jbowler@acm.org> Signed-off-by: John Bowler <jbowler@acm.org>
149 lines
3.5 KiB
C
149 lines
3.5 KiB
C
|
|
/* pngwtran.c - transforms the data in a row for PNG writers
|
|
*
|
|
* Last changed in libpng 1.6.17 [(PENDING RELEASE)]
|
|
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
|
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
|
*
|
|
* This code is released under the libpng license.
|
|
* For conditions of distribution and use, see the disclaimer
|
|
* and license in png.h
|
|
*/
|
|
|
|
#include "pngpriv.h"
|
|
#define PNG_SRC_FILE PNG_SRC_FILE_pngwtran
|
|
|
|
#ifdef PNG_WRITE_PACK_SUPPORTED
|
|
/* Pack pixels into bytes. */
|
|
static void
|
|
png_do_write_pack(png_transformp *transform, png_transform_controlp tc)
|
|
{
|
|
png_alloc_size_t rowbytes = PNG_TC_ROWBYTES(*tc);
|
|
png_const_bytep sp = png_voidcast(png_const_bytep, tc->sp);
|
|
png_const_bytep ep = png_upcast(png_const_bytep, tc->sp) + rowbytes;
|
|
png_bytep dp = png_voidcast(png_bytep, tc->dp);
|
|
|
|
png_debug(1, "in png_do_pack");
|
|
|
|
# define png_ptr tc->png_ptr
|
|
|
|
switch ((*transform)->args)
|
|
{
|
|
case 1:
|
|
{
|
|
unsigned int mask = 0x80, v = 0;
|
|
|
|
while (sp < ep)
|
|
{
|
|
if (*sp++ != 0)
|
|
v |= mask;
|
|
|
|
mask >>= 1;
|
|
|
|
if (mask == 0)
|
|
{
|
|
mask = 0x80;
|
|
*dp++ = PNG_BYTE(v);
|
|
v = 0;
|
|
}
|
|
}
|
|
|
|
if (mask != 0x80)
|
|
*dp++ = PNG_BYTE(v);
|
|
break;
|
|
}
|
|
|
|
case 2:
|
|
{
|
|
unsigned int shift = 8, v = 0;
|
|
|
|
while (sp < ep)
|
|
{
|
|
shift -= 2;
|
|
v |= (*sp++ & 0x3) << shift;
|
|
|
|
if (shift == 0)
|
|
{
|
|
shift = 8;
|
|
*dp++ = PNG_BYTE(v);
|
|
v = 0;
|
|
}
|
|
}
|
|
|
|
if (shift != 8)
|
|
*dp++ = PNG_BYTE(v);
|
|
break;
|
|
}
|
|
|
|
case 4:
|
|
{
|
|
unsigned int shift = 8, v = 0;
|
|
|
|
while (sp < ep)
|
|
{
|
|
shift -= 4;
|
|
v |= ((*sp++ & 0xf) << shift);
|
|
|
|
if (shift == 0)
|
|
{
|
|
shift = 8;
|
|
*dp++ = PNG_BYTE(v);
|
|
v = 0;
|
|
}
|
|
}
|
|
|
|
if (shift != 8)
|
|
*dp++ = PNG_BYTE(v);
|
|
break;
|
|
}
|
|
|
|
default:
|
|
impossible("bit depth");
|
|
}
|
|
|
|
if ((tc->format & PNG_FORMAT_FLAG_COLORMAP) == 0 &&
|
|
--(tc->range) == 0)
|
|
tc->format &= PNG_BIC_MASK(PNG_FORMAT_FLAG_RANGE);
|
|
|
|
tc->bit_depth = (*transform)->args;
|
|
tc->sp = tc->dp;
|
|
# undef png_ptr
|
|
}
|
|
|
|
void /* PRIVATE */
|
|
png_init_write_pack(png_transformp *transform, png_transform_controlp tc)
|
|
{
|
|
# define png_ptr tc->png_ptr
|
|
debug(tc->init);
|
|
# undef png_ptr
|
|
|
|
/* The init routine is called *forward* so the transform control we get has
|
|
* the required bit depth and the transform routine will increase it to 8
|
|
* bits per channel. The code doesn't really care how many channels there
|
|
* are, but the only way to get a channel depth of less than 8 is to have
|
|
* just one channel.
|
|
*/
|
|
if (tc->bit_depth < 8) /* else no packing/unpacking */
|
|
{
|
|
if (tc->init == PNG_TC_INIT_FINAL)
|
|
{
|
|
(*transform)->fn = png_do_write_pack;
|
|
/* Record this for the backwards run: */
|
|
(*transform)->args = tc->bit_depth & 0xf;
|
|
}
|
|
|
|
if ((tc->format & PNG_FORMAT_FLAG_COLORMAP) == 0)
|
|
{
|
|
tc->range++;
|
|
tc->format |= PNG_FORMAT_FLAG_RANGE; /* forwards: backwards cancels */
|
|
}
|
|
|
|
tc->bit_depth = 8;
|
|
}
|
|
|
|
else /* the transform is not applicable */
|
|
(*transform)->fn = NULL;
|
|
}
|
|
#endif /* WRITE_PACK */
|