diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-12-11 07:29:18 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-12-11 07:29:18 -0600 |
| commit | 4cf1ca4338f6d57087dc86c003857112f7a3645e (patch) | |
| tree | c7ce8da1766c017cace04587e0259b3edf7e2eac | |
| parent | f174f270964bfd9fac6e18547920842190bf3ca9 (diff) | |
| download | libpng-4cf1ca4338f6d57087dc86c003857112f7a3645e.tar.gz | |
[master] Relocated png_do_chop() to its original position in pngrtran.c
The change in version 1.2.41beta08 caused transparency to be handled wrong
in some 16-bit datastreams (Yusaku Sugai).
| -rw-r--r-- | ANNOUNCE | 3 | ||||
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | pngrtran.c | 10 |
3 files changed, 11 insertions, 5 deletions
@@ -54,6 +54,9 @@ version 1.2.42beta01 [December 4, 2009] version 1.2.42beta02 [December 11, 2009] Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile + Relocated png_do_chop() to its original position in pngrtran.c; the + change in version 1.2.41beta08 caused transparency to be handled wrong + in some 16-bit datastreams (Yusaku Sugai). Send comments/corrections/commendations to png-mng-implement at lists.sf.net @@ -2617,6 +2617,9 @@ version 1.2.42beta01 [December 4, 2009] version 1.2.42beta02 [December 11, 2009] Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile + Relocated png_do_chop() to its original position in pngrtran.c; the + change in version 1.2.41beta08 caused transparency to be handled wrong + in some 16-bit datastreams (Yusaku Sugai). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrtran.c b/pngrtran.c index 6ba8afed4..d32f0c4ab 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1437,11 +1437,6 @@ png_do_read_transformations(png_structp png_ptr) png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1); #endif -#ifdef PNG_READ_16_TO_8_SUPPORTED - if (png_ptr->transformations & PNG_16_TO_8) - png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); -#endif - #ifdef PNG_READ_BACKGROUND_SUPPORTED if ((png_ptr->transformations & PNG_BACKGROUND) && ((png_ptr->num_trans != 0 ) || @@ -1471,6 +1466,11 @@ png_do_read_transformations(png_structp png_ptr) png_ptr->gamma_shift); #endif +#ifdef PNG_READ_16_TO_8_SUPPORTED + if (png_ptr->transformations & PNG_16_TO_8) + png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); +#endif + #ifdef PNG_READ_DITHER_SUPPORTED if (png_ptr->transformations & PNG_DITHER) { |