mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Fixed some errors with 16_TO_8 macros

Browse Source 
pngvalid still fails two tests, problem with row buffer.
This commit is contained in:
Glenn Randers-Pehrson 2011-06-17 22:28:23 -05:00
parent 98f053edbd
commit e6a8060a71
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
png.h
View File

@ -1424,7 +1424,7 @@ PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
#endif #endif
#ifdef PNG_READ_16_TO_8_SUPPORTED #ifdef PNG_READ_16_TO_8_SUPPORTED
# ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
/* Scale a 16-bit depth file down to 8-bit, accurately. */ /* Scale a 16-bit depth file down to 8-bit, accurately. */
PNG_EXPORT(48, void, png_set_scale_16, (png_structp png_ptr)); PNG_EXPORT(48, void, png_set_scale_16, (png_structp png_ptr));
# endif # endif

14
pngrtran.c
View File

@ -2146,13 +2146,13 @@ png_do_read_transformations(png_structp png_ptr)
png_do_encode_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1, png_ptr); png_do_encode_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1, png_ptr);
#endif #endif
#ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
if (png_ptr->transformations & PNG_16_TO_8) if (png_ptr->transformations & PNG_16_TO_8)
png_do_scale_16_to_8(&(png_ptr->row_info), png_ptr->row_buf + 1); png_do_scale_16_to_8(&(png_ptr->row_info), png_ptr->row_buf + 1);
# ifdef PNG_READ_CHOP_16_TO_8_SUPPORTED #endif
else if (png_ptr->transformations & PNG_CHOP_16_TO_8) #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
if (png_ptr->transformations & PNG_16_TO_8)
png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
# endif
#endif #endif
#ifdef PNG_READ_QUANTIZE_SUPPORTED #ifdef PNG_READ_QUANTIZE_SUPPORTED
@ -2481,7 +2481,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
} }
#endif #endif
#ifdef PNG_READ_16_TO_8_SUPPORTED #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
/* Scale rows of bit depth 16 down to 8 accurately */ /* Scale rows of bit depth 16 down to 8 accurately */
void /* PRIVATE */ void /* PRIVATE */
png_do_scale_16_to_8(png_row_infop row_info, png_bytep row) png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
@ -2538,7 +2538,9 @@ png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
row_info->rowbytes = row_info->width * row_info->channels; row_info->rowbytes = row_info->width * row_info->channels;
} }
} }
#endif
#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
void /* PRIVATE */ void /* PRIVATE */
/* Simply discard the low byte. This was the default behavior prior /* Simply discard the low byte. This was the default behavior prior
* to libpng-1.5.4. * to libpng-1.5.4.
@ -2564,7 +2566,7 @@ png_do_chop(png_row_infop row_info, png_bytep row)
row_info->rowbytes = row_info->width * row_info->channels; row_info->rowbytes = row_info->width * row_info->channels;
} }
} }
#endif /* PNG_READ_16_TO_8_SUPPORTED */ #endif
#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
void /* PRIVATE */ void /* PRIVATE */