From caac294b44e02fe8dc67e305ec47bfccc2b267d8 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 1 Oct 2009 13:36:18 +0000 Subject: [PATCH] --- ChangeLog | 1 + coders/dpx.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16b880284..d11f9fdf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2009-10-01 6.5.6-7 Cristy * 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 * Permit percentage of hue for HSL (e.g. hsl(12%,...)). diff --git a/coders/dpx.c b/coders/dpx.c index 2335d2d80..788400341 100644 --- 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++) -- 2.40.0