Check for sampling-factor option only if sampling-factor image property is NULL.

[imagemagick] / coders / vicar.c

diff --git a/coders/vicar.c b/coders/vicar.c
index 752200094c36c802e8b60b7ddc179e509fb7bc02..02fa813223a6480816959db57f5dec7ac1e62248 100644 (file)
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -195,7 +195,6 @@ static Image *ReadVICARImage(const ImageInfo *image_info,
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
-  (void) SetImageColorspace(image,GRAYColorspace,exception);
   /*
     Decode image header.
   */
@@ -290,6 +289,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info,
   /*
     Read VICAR pixels.
   */
+  (void) SetImageColorspace(image,GRAYColorspace,exception);
   quantum_type=GrayQuantum;
   quantum_info=AcquireQuantumInfo(image_info,image);
   if (quantum_info == (QuantumInfo *) NULL)
@@ -457,8 +457,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-      (IsImageGray(image,exception) == MagickFalse))
+  if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Write header.