[libpng16] Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose()

in pngrtran.c (Domani Hannes).

ANNOUNCE

 
-Libpng 1.6.0beta30 - September 30, 2012
+Libpng 1.6.0beta30 - October 24, 2012
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -504,7 +504,7 @@ Version 1.6.0beta29 [September 4, 2012]
     part plus guessing a gAMA value requires code to pass selected RGB values
     through the profile.
 
-Version 1.6.0beta30 [September 30, 2012]
+Version 1.6.0beta30 [October 24, 2012]
   Changed ICC profile matrix/vector types to not depend on array type rules.
     By the ANSI-C standard the new types should be identical to the previous
     versions, and all known versions of gcc tested with the previous versions
@@ -522,6 +522,8 @@ Version 1.6.0beta30 [September 30, 2012]
     builds, fixed build errors and corrected a minor exit code error in
     pngvalid if the 'touch' file name is invalid.
   Add updated WARNING file to projects/vstudio from libpng 1.5/vstudio
+  Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
+    pngrtran.c (Domani Hannes).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -4256,7 +4256,7 @@ Version 1.6.0beta29 [September 4, 2012]
     part plus guessing a gAMA value requires code to pass selected RGB values
     through the profile.
 
-Version 1.6.0beta30 [September 30, 2012]
+Version 1.6.0beta30 [October 24, 2012]
   Changed ICC profile matrix/vector types to not depend on array type rules.
     By the ANSI-C standard the new types should be identical to the previous
     versions, and all known versions of gcc tested with the previous versions
@@ -4274,6 +4274,8 @@ Version 1.6.0beta30 [September 30, 2012]
     builds, fixed build errors and corrected a minor exit code error in
     pngvalid if the 'touch' file name is invalid.
   Add updated WARNING file to projects/vstudio from libpng 1.5/vstudio
+  Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
+    pngrtran.c (Domani Hannes).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

pngrtran.c

@@ -3968,7 +3968,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
                         *sp = (png_byte)png_ptr->background.gray;
 
                      else if (a < 0xff)
-                        png_composite(*sp, *sp, a, png_ptr->background_1.gray);
+                        png_composite(*sp, *sp, a, png_ptr->background.gray);
                   }
                }
             }
@@ -4037,7 +4037,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
                         png_uint_16 g, v;
 
                         g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_composite_16(v, g, a, png_ptr->background_1.gray);
+                        png_composite_16(v, g, a, png_ptr->background.gray);
                         *sp = (png_byte)((v >> 8) & 0xff);
                         *(sp + 1) = (png_byte)(v & 0xff);
                      }