(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 16b88028482991bdeafa4b84e1b86dae48ff73f5..d11f9fdf5cb4aaf5beec725c2a22dccfc359c6fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-10-01  6.5.6-7 Cristy  <quetzlzacatenango@image...>
   * Don't use group4 compression if the image is truecolor.
+  * If image is gray, write grayscale DPX images.
 
 2009-09-25  6.5.6-6 Cristy  <quetzlzacatenango@image...>
   * Permit percentage of hue for HSL (e.g. hsl(12%,...)).

diff --git a/coders/dpx.c b/coders/dpx.c
index 2335d2d80e9d738b23fbb506bfc6cc7e088789ef..78840034163a450866cc2e1acaa96a2e0ed5e06e 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1557,6 +1557,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
           dpx.image.image_element[i].descriptor=RGBComponentType;
           if (image->matte != MagickFalse)
             dpx.image.image_element[i].descriptor=RGBAComponentType;
+          if (IsGrayImage(image,&image->exception) != MagickFalse)
+            dpx.image.image_element[i].descriptor=LumaComponentType;
           break;
         }
       }
@@ -1881,11 +1883,10 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
     }
   extent=GetBytesPerRow(image->columns,image->matte != MagickFalse ? 4UL : 3UL,
     image->depth,MagickTrue);
-  if (0)
+  if (IsGrayImage(image,&image->exception) != MagickFalse)
     {
       quantum_type=GrayQuantum;
-      extent=GetBytesPerRow(image->columns,image->matte != MagickFalse ?
-        4UL : 3UL,image->depth,MagickTrue);
+      extent=GetBytesPerRow(image->columns,1UL,image->depth,MagickTrue);
     }
   pixels=GetQuantumPixels(quantum_info);
   for (y=0; y < (long) image->rows; y++)