Changeset 4271 for ImageMagick/trunk/coders/png.c

Timestamp:

04/22/11 10:02:20 (2 years ago)

Author:

glennrp

Message:

Decode the bKGD chunk properly with Q32 and Q64 builds.

File:

• ImageMagick/trunk/coders/png.c (modified) (5 diffs)

ImageMagick/trunk/coders/png.c

@@ -2020 +2020 @@
                       (int) mng_info->global_trns_length,NULL);
                   }
-#if defined(PNG_READ_bKGD_SUPPORTED)
+#ifdef PNG_READ_bKGD_SUPPORTED
               if (
 #ifndef PNG_READ_EMPTY_PLTE_SUPPORTED
@@ -2057 +2057 @@
         }
 
-#if defined(PNG_READ_bKGD_SUPPORTED)
+#ifdef PNG_READ_bKGD_SUPPORTED
   if (mng_info->have_global_bkgd &&
           (!png_get_valid(ping,ping_info,PNG_INFO_bKGD)))
@@ -2064 +2064 @@
   if (png_get_valid(ping,ping_info,PNG_INFO_bKGD))
     {
+      unsigned int
+        bkgd_scale;
+
       /*
         Set image background color.
@@ -2071 +2074 @@
           "    Reading PNG bKGD chunk.");
 
-      if (ping_bit_depth == MAGICKCORE_QUANTUM_DEPTH)
-        {
-          image->background_color.red=ping_background->red;
-          image->background_color.green=ping_background->green;
-          image->background_color.blue=ping_background->blue;
-        }
-
-      else /* Scale background components to 16-bit */
-        {
-          unsigned int
-            bkgd_scale;
-
-          if (logging != MagickFalse)
-            (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-              "    raw ping_background=(%d,%d,%d).",ping_background->red,
-              ping_background->green,ping_background->blue);
-
-          bkgd_scale = 1;
-
-          if (ping_bit_depth == 1)
-             bkgd_scale = 255;
-
-          else if (ping_bit_depth == 2)
-             bkgd_scale = 85;
-
-          else if (ping_bit_depth == 4)
-             bkgd_scale = 17;
-
-          if (ping_bit_depth <= 8)
-             bkgd_scale *= 257;
-
-          ping_background->red *= bkgd_scale;
-          ping_background->green *= bkgd_scale;
-          ping_background->blue *= bkgd_scale;
-
-          if (logging != MagickFalse)
-            {
+      /* Scale background components to 16-bit, then scale
+       * to quantum depth
+       */
+        if (logging != MagickFalse)
+          (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+            "    raw ping_background=(%d,%d,%d).",ping_background->red,
+            ping_background->green,ping_background->blue);
+
+        bkgd_scale = 1;
+
+        if (ping_bit_depth == 1)
+           bkgd_scale = 255;
+
+        else if (ping_bit_depth == 2)
+           bkgd_scale = 85;
+
+        else if (ping_bit_depth == 4)
+           bkgd_scale = 17;
+
+        if (ping_bit_depth <= 8)
+           bkgd_scale *= 257;
+
+        ping_background->red *= bkgd_scale;
+        ping_background->green *= bkgd_scale;
+        ping_background->blue *= bkgd_scale;
+
+        if (logging != MagickFalse)
+          {
             (void) LogMagickEvent(CoderEvent,GetMagickModule(),
               "    bkgd_scale=%d.",bkgd_scale);
@@ -2114 +2108 @@
               "    ping_background=(%d,%d,%d).",ping_background->red,
               ping_background->green,ping_background->blue);
-            }
-
-          image->background_color.red=
+          }
+
+        image->background_color.red=
             ScaleShortToQuantum(ping_background->red);
 
-          image->background_color.green=
+        image->background_color.green=
             ScaleShortToQuantum(ping_background->green);
 
-          image->background_color.blue=
-            ScaleShortToQuantum(ping_background->blue);
-
-          image->background_color.opacity=OpaqueOpacity;
-
-          if (logging != MagickFalse)
-            (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-              "    image->background_color=(%.20g,%.20g,%.20g).",
-              (double) image->background_color.red,
-              (double) image->background_color.green,
-              (double) image->background_color.blue);
-        }
-    }
-#endif
+        image->background_color.blue=
+          ScaleShortToQuantum(ping_background->blue);
+
+        image->background_color.opacity=OpaqueOpacity;
+
+        if (logging != MagickFalse)
+          (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+            "    image->background_color=(%.20g,%.20g,%.20g).",
+            (double) image->background_color.red,
+            (double) image->background_color.green,
+            (double) image->background_color.blue);
+    }
+#endif /* PNG_READ_bKGD_SUPPORTED */
 
   if (png_get_valid(ping,ping_info,PNG_INFO_tRNS))