From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 22 Sep 2009 02:24:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10656
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa67ab05fc2d3c4c8271197d6bf043fcc8c7615f;p=imagemagick

---

diff --git a/magick/composite.c b/magick/composite.c
index f22ffe2ed..9132b4b6d 100644
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -2598,8 +2598,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
       if ((x+(long) width) > (long) image->columns)
         width=image->columns-x;
       (void) CopyMagickMemory(q,p,width*sizeof(*p));
-      if ((indexes != (IndexPacket *) NULL) &&
-          (texture_indexes != (const IndexPacket *) NULL))
+      if ((image->colorspace == CMYKColorspace) &&
+          (texture->colorspace == CMYKColorspace))
         {
           (void) CopyMagickMemory(indexes,texture_indexes,width*
             sizeof(*indexes));
diff --git a/magick/decorate.c b/magick/decorate.c
index 1841c09b1..422b42679 100644
--- a/magick/decorate.c
+++ b/magick/decorate.c
@@ -471,8 +471,8 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
           }
         indexes=GetCacheViewVirtualIndexQueue(image_view);
         (void) CopyMagickMemory(q,p,image->columns*sizeof(*p));
-        if ((indexes != (IndexPacket *) NULL) &&
-             (frame_indexes != (const IndexPacket *) NULL))
+        if ((image->colorspace == CMYKColorspace) &&
+            (frame_image->colorspace == CMYKColorspace))
           {
             (void) CopyMagickMemory(frame_indexes,indexes,image->columns*
               sizeof(*indexes));