[devel] Imported from libpng-1.5.4beta05.tar

This commit is contained in:
Glenn Randers-Pehrson
2011-06-17 20:38:24 -05:00
parent ab63dd0892
commit fb29e51dbd
19 changed files with 83 additions and 73 deletions

View File

@@ -231,8 +231,8 @@ uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes)
png_set_expand(png_ptr);
#ifdef PNG_READ_16_TO_8_SUPPORTED
if (bit_depth == 16)
# ifdef PNG_READ_CHOP_16_TO_8_SUPPORTED
png_set_chop_16(png_ptr);
# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
png_set_scale_16(png_ptr);
# else
png_set_strip_16(png_ptr);
# endif

View File

@@ -313,8 +313,8 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr)
png_set_expand(png_ptr);
#ifdef PNG_READ_16_TO_8_SUPPORTED
if (bit_depth == 16)
# ifdef PNG_READ_CHOP_16_TO_8_SUPPORTED
png_set_chop_16(png_ptr);
# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
png_set_scale_16(png_ptr);
# else
png_set_strip_16(png_ptr);
# endif

View File

@@ -37,4 +37,4 @@ option SETJMP on
option STDIO on
option READ_EXPAND on
option READ_16_TO_8 on
option READ_16_TO_8_ACCURATE_SCALE on
option READ_STRIP_16_TO_8 on

View File

@@ -37,5 +37,5 @@ option READ_bKGD on
option READ_GAMMA on
option READ_EXPAND on
option READ_16_TO_8 on
option READ_CHOP_16_TO_8 on
option READ_STRIP_16_TO_8 on
option READ_GRAY_TO_RGB on

View File

@@ -177,8 +177,8 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
#ifdef PNG_READ_16_TO_8_SUPPORTED
if (iBitDepth == 16)
# ifdef PNG_READ_CHOP_16_TO_8_SUPPORTED
png_set_chop_16(png_ptr);
# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
png_set_scale_16(png_ptr);
# else
png_set_strip_16(png_ptr);
# endif