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

Timestamp:

03/07/11 12:40:17 (2 years ago)

Author:

glennrp

Message:

Ifdef out currently unused "depth_4_ok" and "depth_2_ok" variable definitions.

File:

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

ImageMagick/trunk/coders/png.c

@@ -8304 +8304 @@
               }
 
-#if 1 /* To do: Enable this when low bit-depth grayscale is working */
             else if (ping_color_type ==
                 PNG_COLOR_TYPE_GRAY && image_colors < 17 &&
                 mng_info->IsPalette)
               {
-
               /* Check if grayscale is reducible */
+
+#define LOW_DEPTH_OK 0 /* To do: eliminate this when low bit-depths work */
                 int
+#if LOW_DEPTH_OK==1
                   depth_4_ok=MagickTrue,
                   depth_2_ok=MagickTrue,
+#endif
                   depth_1_ok=MagickTrue;
 
@@ -8323 +8325 @@
                    intensity=ScaleQuantumToChar(image->colormap[i].red);
 
+#if LOW_DEPTH_OK==1
                    if ((intensity & 0x0f) != ((intensity & 0xf0) >> 4))
                      depth_4_ok=depth_2_ok=depth_1_ok=MagickFalse;
-
                    else if ((intensity & 0x03) != ((intensity & 0x0c) >> 2))
                      depth_2_ok=depth_1_ok=MagickFalse;
-
-                   else if ((intensity & 0x01) != ((intensity & 0x02) >> 1))
+                   else
+#endif
+                     if ((intensity & 0x01) != ((intensity & 0x02) >> 1))
                      depth_1_ok=MagickFalse;
-                   (void) depth_4_ok;
                 }
 
@@ -8337 +8339 @@
                   ping_bit_depth=1;
 
-#if 0 /* To do: Enable this when bit depths 2 and 4 are working. */
+#if LOW_DEPTH_OK==1
                 else if (depth_2_ok && mng_info->write_png_depth <= 2)
                   ping_bit_depth=2;
@@ -8345 +8347 @@
 #endif
               }
-#endif /* 1 */
           }