commit 176b29a003f11fd934137871d574995319408665
author cristy <urban-warrior@git.imagemagick.org> Thu Jun 21 13:35:15 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Jun 21 13:35:15 2012 +0000
tree dbc5f5029318bc66d8a7dcce9a0629eda69aaea2
parent 74ca15014e8d5d35c5d891926c3ea8ce1c0b881d

coders/miff.c

diff --git a/coders/miff.c b/coders/miff.c
index 5d7b5c9..30b4b4d 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -688,7 +688,7 @@
                       MagickFalse,options);
                     if (colorspace < 0)
                       break;
-                    image->colorspace=(ColorspaceType) colorspace;
+                    (void) SetImageColorspace(image,(ColorspaceType) colorspace,                      exception);
                     break;
                   }
                 if (LocaleCompare(keyword,"compression") == 0)

coders/mpc.c

diff --git a/coders/mpc.c b/coders/mpc.c
index 0b71122..429ce79 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -388,7 +388,7 @@
                       MagickFalse,options);
                     if (colorspace < 0)
                       break;
-                    image->colorspace=(ColorspaceType) colorspace;
+                    (void) SetImageColorspace(image,(ColorspaceType) colorspace,                      exception);
                     break;
                   }
                 if (LocaleCompare(keyword,"compression") == 0)

coders/png.c

diff --git a/coders/png.c b/coders/png.c
index f3d83d1..bc9c4df 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2280,6 +2280,14 @@
   image->depth=ping_bit_depth;
   image->depth=GetImageQuantumDepth(image,MagickFalse);
   image->interlace=ping_interlace_method != 0 ? PNGInterlace : NoInterlace;
+  if (((int) ping_color_type == PNG_COLOR_TYPE_GRAY) ||
+      ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+    {
+      image->rendering_intent=UndefinedIntent;
+      image->gamma=1.000;
+      (void) ResetMagickMemory(&image->chromaticity,0,
+        sizeof(image->chromaticity));
+    }
   if (logging != MagickFalse)
     {
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),