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

[libpng17] Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is

Browse Source 
needed by png_reciprocal2().
Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
    png_do_swap().
This commit is contained in:
Glenn Randers-Pehrson
2014-11-06 21:14:16 -06:00
parent 05dcaffd38
commit 9c0b5ab848
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
png.c
View File

@@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.7.0beta41 - November 6, 2014" PNG_STRING_NEWLINE \
"libpng version 1.7.0beta41 - November 7, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
return "libpng version 1.7.0beta41 - November 6, 2014\
return "libpng version 1.7.0beta41 - November 7, 2014\
Copyright (c) 1998-2014 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -3277,7 +3277,7 @@ png_gamma_significant(png_fixed_point gamma_val)
#ifdef PNG_READ_GAMMA_SUPPORTED
/* A local convenience routine. */
#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
#if defined(PNG_16BIT_SUPPORTED) || !defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
static png_fixed_point
png_product2(png_fixed_point a, png_fixed_point b)
{
@@ -3298,7 +3298,7 @@ png_product2(png_fixed_point a, png_fixed_point b)
return 0; /* overflow */
}
#endif
#endif /* PNG_16BIT_SUPPORTED || !PNG_FLOATING_ARITHMETIC_SUPPORTED */
/* The inverse of the above. */
png_fixed_point
@@ -3450,6 +3450,7 @@ png_log8bit(unsigned int x)
* Zero (257): 0
* End (258): 23499
*/
#ifdef PNG_16BIT_SUPPORTED
static png_int_32
png_log16bit(png_uint_32 x)
{
@@ -3500,6 +3501,7 @@ png_log16bit(png_uint_32 x)
/* Safe, because the result can't have more than 20 bits: */
return (png_int_32)((lg2 + 2048) >> 12);
}
#endif /* 16BIT */
/* The 'exp()' case must invert the above, taking a 20-bit fixed point
* logarithmic value and returning a 16 or 8-bit number as appropriate. In