(no commit message)

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index eb70cfdc18dcfeff8859593086478b1d819569fd..0e21c7672a4e6a64a57c9bcb920e1292cfb6d285 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -171,13 +171,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
     exception);
   artifact=GetImageArtifact(image,"lowlight-color");
   if (artifact != (const char *) NULL)
-    (void) QueryColorCompliance(artifact,AllCompliance,&lowlight,
-      exception);
-  if (highlight_image->colorspace == CMYKColorspace)
-    {
-      ConvertRGBToCMYK(&highlight);
-      ConvertRGBToCMYK(&lowlight);
-    }
+    (void) QueryColorCompliance(artifact,AllCompliance,&lowlight,exception);
   /*
     Generate difference image.
   */

diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 03582b136dfcb91391914c17fd84a980fc60e3d9..6f12c2c66799bbeca89a3d1b3cec9024392a5f18 100644 (file)
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -275,16 +275,6 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
   trough.green=QuantumScale*matte.green*TroughModulate;
   trough.blue=QuantumScale*matte.blue*TroughModulate;
   trough.alpha=matte.alpha;
-  if (image->colorspace == CMYKColorspace)
-    {
-      ConvertRGBToCMYK(&interior);
-      ConvertRGBToCMYK(&matte);
-      ConvertRGBToCMYK(&border);
-      ConvertRGBToCMYK(&accentuate);
-      ConvertRGBToCMYK(&highlight);
-      ConvertRGBToCMYK(&shadow);
-      ConvertRGBToCMYK(&trough);
-    }
   status=MagickTrue;
   progress=0;
   image_view=AcquireCacheView(image);

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 5aa50d4e435bd1122bfefb5349f8ed974239670c..b934e1b7c220c0b00810a5d468447df167449ab2 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -2315,7 +2315,6 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
       SetPixelInfoPacket(distort_image,&distort_image->matte_color,&invalid);
       if (distort_image->colorspace == CMYKColorspace)
         ConvertRGBToCMYK(&invalid);   /* what about other color spaces? */
-
       for (i=0; i < (ssize_t) distort_image->columns; i++)
       {
         /* map pixel coordinate to distortion space coordinate */

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 74725aef0c18c9ab5cbf06d2bda4c99181998a16..4f56f59706d08c6b8765049d7fec552abc60a489 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2449,8 +2449,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
         break;
       GetPixelInfo(image,&background);
       SetPixelInfoPacket(image,&image->background_color,&background);
-      if (image->colorspace == CMYKColorspace)
-        ConvertRGBToCMYK(&background);
       SetPacketPixelInfo(image,&background,&pixel);
       image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -2608,8 +2606,6 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
     image->matte=MagickTrue;
   GetPixelInfo(image,&background);
   SetPixelInfoPacket(image,&image->background_color,&background);
-  if (image->colorspace == CMYKColorspace)
-    ConvertRGBToCMYK(&background);
   SetPacketPixelInfo(image,&background,&pixel);
   /*
     Set image background color.

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 3ba6fe14f7807dfbf6eccd12287afcd5745f4af4..5d13857cb5d53851bcfe1dc723c4f7ae4af7274d 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -336,8 +336,6 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
         {
           (void) GetFillColor(draw_info,x,y,&fill_color,exception);
           SetPixelInfoPacket(image,&fill_color,&fill);
-          if (image->colorspace == CMYKColorspace)
-            ConvertRGBToCMYK(&fill);
           if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
             SetPixelRed(image,ClampToQuantum(fill.red),q);
           if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 61eb9aea46271cff89cbf28219694e90027bb778..384faee803bdcde0b0006c1c1e4e40c7a493800b 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1482,8 +1482,6 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   GetPixelInfo(image,&background);
   SetPixelInfoPacket(image,&image->background_color,&background);
-  if (image->colorspace == CMYKColorspace)
-    ConvertRGBToCMYK(&background);
   /*
     X shear image.
   */
@@ -1700,8 +1698,6 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   GetPixelInfo(image,&background);
   SetPixelInfoPacket(image,&image->background_color,&background);
-  if (image->colorspace == CMYKColorspace)
-    ConvertRGBToCMYK(&background);
   /*
     Y Shear image.
   */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 6e90d74f45887d1a80069131cc30c72a115d99c0..ca147bd00b96e7e78ab17c00c4c3042bc44f814f 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-20"
+#define MagickReleaseDate  "2011-10-22"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 7e47c6682265f12129f986c569439da817947871..98145abec9d40c90faaf823778a240f446588d24 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -4437,7 +4437,8 @@ static Image *XGetWindowImage(Display *display,const Window window,
                     ScaleShortToQuantum(colors[index].blue),q);
                   q+=GetPixelChannels(composite_image);
                 }
-                if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
+                status=SyncCacheViewAuthenticPixels(composite_view,exception);
+                if (status == MagickFalse)
                   break;
               }
             else
@@ -4464,7 +4465,8 @@ static Image *XGetWindowImage(Display *display,const Window window,
                     ScaleShortToQuantum((unsigned short) color),q);
                   q+=GetPixelChannels(composite_image);
                 }
-                if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
+                status=SyncCacheViewAuthenticPixels(composite_view,exception);
+                if (status == MagickFalse)
                   break;
               }
             break;
@@ -4474,7 +4476,9 @@ static Image *XGetWindowImage(Display *display,const Window window,
             /*
               Create colormap.
             */
-            if (AcquireImageColormap(composite_image,number_colors,exception) == MagickFalse)
+            status=AcquireImageColormap(composite_image,number_colors,
+              exception);
+            if (status == MagickFalse)
               {
                 XDestroyImage(ximage);
                 composite_image=DestroyImage(composite_image);
@@ -4506,7 +4510,8 @@ static Image *XGetWindowImage(Display *display,const Window window,
                   composite_image->colormap+(ssize_t) index,q);
                 q+=GetPixelChannels(composite_image);
               }
-              if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
+              status=SyncCacheViewAuthenticPixels(composite_view,exception);
+              if (status == MagickFalse)
                 break;
             }
             break;