commit a272d8fe3dff9ee7d73000bf870a79ba39920d09
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Fri Jun 25 21:45:31 2010 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Fri Jun 25 21:45:31 2010 -0500
tree 06c204a5eaf7415d2e768adb47f54271265c606a
parent a81c59a960b5c047841a66815355728dc6228308

[devel] Made FIXED and FLOATING options consistent in the APIs they enable
and disable.  Corrected scripts/options.awk to handle both command line
options and options specified in the .dfa files.

pngset.c

diff --git a/pngset.c b/pngset.c
index 59d8225..85c4bc5 100644
--- a/pngset.c
+++ b/pngset.c
@@ -141,6 +141,7 @@
       png_warning(png_ptr, "Setting gamma = 0");
 }
 #endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
 void PNGAPI
 png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
     int_gamma)
@@ -172,15 +173,14 @@
 #ifdef PNG_FLOATING_POINT_SUPPORTED
    info_ptr->gamma = (float)(png_gamma/100000.);
 #endif
-#ifdef PNG_FIXED_POINT_SUPPORTED
    info_ptr->int_gamma = png_gamma;
-#endif
    info_ptr->valid |= PNG_INFO_gAMA;
 
    if (png_gamma == 0)
       png_warning(png_ptr, "Setting gamma = 0");
 }
 #endif
+#endif
 
 #ifdef PNG_hIST_SUPPORTED
 void PNGAPI
@@ -368,7 +368,7 @@
 }
 #endif
 
-#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)
+#ifdef PNG_sCAL_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
 png_set_sCAL(png_structp png_ptr, png_infop info_ptr,
@@ -385,7 +385,7 @@
 
    info_ptr->valid |= PNG_INFO_sCAL;
 }
-#else
+#endif
 #ifdef PNG_FIXED_POINT_SUPPORTED
 void PNGAPI
 png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
@@ -440,7 +440,6 @@
 }
 #endif
 #endif
-#endif
 
 #ifdef PNG_pHYs_SUPPORTED
 void PNGAPI
@@ -558,13 +557,13 @@
    png_set_sRGB(png_ptr, info_ptr, intent);
 
 #ifdef PNG_gAMA_SUPPORTED
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-   file_gamma = (float).45455;
-   png_set_gAMA(png_ptr, info_ptr, file_gamma);
-#endif
 #ifdef PNG_FIXED_POINT_SUPPORTED
    int_file_gamma = 45455L;
    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
+#else
+   /* Floating point must be set! */
+   file_gamma = (float).45455;
+   png_set_gAMA(png_ptr, info_ptr, file_gamma);
 #endif
 #endif