diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-06-15 21:56:14 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-06-16 06:35:35 -0500 |
| commit | d60c886ebcbfffdc9f650897934f31712130f3b7 (patch) | |
| tree | 8e1fd735a71a26352b95ca19ba559e9fdd100259 /pngrtran.c | |
| parent | 6c7a09ab7cfe8711eeb6d3024935d12d2dbc0d14 (diff) | |
| download | libpng-d60c886ebcbfffdc9f650897934f31712130f3b7.tar.gz | |
[devel] Imported from libpng-1.4.0beta63.tarv1.4.0beta63
Diffstat (limited to 'pngrtran.c')
| -rw-r--r-- | pngrtran.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pngrtran.c b/pngrtran.c index 4dd0c0fd8..c889e7573 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [June 5, 2009] + * Last changed in libpng 1.4.0 [June 16, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1186,10 +1186,6 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr) { if (png_ptr->transformations & PNG_EXPAND_tRNS) info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; -#if 0 /* Removed from libpng-1.2.27 */ - else - info_ptr->color_type |= PNG_COLOR_MASK_COLOR; -#endif } if (info_ptr->bit_depth < 8) info_ptr->bit_depth = 8; @@ -1381,12 +1377,12 @@ png_do_read_transformations(png_structp png_ptr) #endif /* From Andreas Dilger e-mail to png-implement, 26 March 1998: - * + * * In most cases, the "simple transparency" should be done prior to doing * gray-to-RGB, or you will have to test 3x as many bytes to check if a * pixel is transparent. You would also need to make sure that the * transparency information is upgraded to RGB. - * + * * To summarize, the current flow is: * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite * with background "in place" if transparent, @@ -4075,7 +4071,7 @@ png_build_gamma_table(png_structp png_ptr) #else png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p))); - png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); + png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); #endif if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND)) @@ -4142,7 +4138,7 @@ png_build_gamma_table(png_structp png_ptr) #else png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p ))); - png_memset(png_ptr->gamma_16_to_1, 0, num * png_sizeof(png_uint_16p)); + png_memset(png_ptr->gamma_16_to_1, 0, num * png_sizeof(png_uint_16p)); #endif for (i = 0; i < num; i++) @@ -4173,7 +4169,7 @@ png_build_gamma_table(png_structp png_ptr) png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p))); png_memset(png_ptr->gamma_16_from_1, 0, - num * png_sizeof(png_uint_16p)); + num * png_sizeof(png_uint_16p)); #endif for (i = 0; i < num; i++) |