cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Removed #if/#else/#endif from inside two pow() calls in pngvalid.c

Browse Source 
because they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function.
This commit is contained in:
Glenn Randers-Pehrson 2014-03-17 15:29:25 -05:00
parent 23646318e4
commit a518abd582
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ANNOUNCE
View File

@ -32,6 +32,9 @@ Version 1.6.11beta01 [March 17, 2014]
Moved configuration information from the manual to the INSTALL file. Moved configuration information from the manual to the INSTALL file.
Version 1.6.11beta02 [March 17, 2014] Version 1.6.11beta02 [March 17, 2014]
Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because
they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -4881,6 +4881,9 @@ Version 1.6.11beta01 [March 17, 2014]
Moved configuration information from the manual to the INSTALL file. Moved configuration information from the manual to the INSTALL file.
Version 1.6.11beta02 [March 17, 2014] Version 1.6.11beta02 [March 17, 2014]
Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because
they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

15
contrib/libtests/pngvalid.c
View File

@ -6776,14 +6776,13 @@ image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this,
* conversion adds another +/-2 in the 16-bit case and * conversion adds another +/-2 in the 16-bit case and
* +/-(1<<(15-PNG_MAX_GAMMA_8)) in the 8-bit case. * +/-(1<<(15-PNG_MAX_GAMMA_8)) in the 8-bit case.
*/ */
that->pm->limit += pow(
# if PNG_MAX_GAMMA_8 < 14 # if PNG_MAX_GAMMA_8 < 14
(that->this.bit_depth == 16 ? 8. : that->pm->limit += pow((that->this.bit_depth == 16 ? 8. :
6. + (1<<(15-PNG_MAX_GAMMA_8))) 6. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma);
# else # else
8. that->pm->limit += pow((that->this.bit_depth == 16 ? 8. :
8. + (1<<(15-PNG_MAX_GAMMA_8)))/65535, data.gamma);
# endif # endif
/65535, data.gamma);
} }
else else
@ -6801,13 +6800,11 @@ image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this,
* internal calculation errors, not the actual limit imposed by * internal calculation errors, not the actual limit imposed by
* pngvalid on the output errors. * pngvalid on the output errors.
*/ */
that->pm->limit += pow(
# if DIGITIZE # if DIGITIZE
1.1 that->pm->limit += pow(1.1 /255, data.gamma);
# else # else
1. that->pm->limit += pow(1.0 /255, data.gamma);
# endif # endif
/255, data.gamma);
} }
} }