commit f9d6dc0085244ce46c61d16e4614e43e535da3af
author cristy <urban-warrior@git.imagemagick.org> Thu Jan 19 02:14:44 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Jan 19 02:14:44 2012 +0000
tree 5d65de5a76f36dd7064007c09ff2123575ad829f
parent 1707c6ca38c5027e242a616d8e463a4a14641999

MagickCore/annotate.c

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index e40606a..3be7d4a 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1950,7 +1950,8 @@
       image_info=AcquireImageInfo();
       client_name=GetClientName();
       resource_database=XGetResourceDatabase(display,client_name);
-      XGetResourceInfo(image_info,resource_database,client_name,&resource_info);
+      XGetResourceInfo(image_info,resource_database,client_name,
+        &resource_info);
       resource_info.close_server=MagickFalse;
       resource_info.colormap=PrivateColormap;
       resource_info.font=AcquireString(draw_info->font);

MagickCore/compare.c

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 477aeb4..265c5ee 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -161,14 +161,11 @@
       return((Image *) NULL);
     }
   (void) SetImageAlphaChannel(highlight_image,OpaqueAlphaChannel,exception);
-  (void) QueryColorCompliance("#f1001ecc",AllCompliance,&highlight,
-    exception);
+  (void) QueryColorCompliance("#f1001e33",AllCompliance,&highlight,exception);
   artifact=GetImageArtifact(image,"highlight-color");
   if (artifact != (const char *) NULL)
-    (void) QueryColorCompliance(artifact,AllCompliance,&highlight,
-      exception);
-  (void) QueryColorCompliance("#ffffffcc",AllCompliance,&lowlight,
-    exception);
+    (void) QueryColorCompliance(artifact,AllCompliance,&highlight,exception);
+  (void) QueryColorCompliance("#ffffff33",AllCompliance,&lowlight,exception);
   artifact=GetImageArtifact(image,"lowlight-color");
   if (artifact != (const char *) NULL)
     (void) QueryColorCompliance(artifact,AllCompliance,&lowlight,exception);

MagickCore/draw.c

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index a512028..a464522 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1270,7 +1270,7 @@
     coordinates;
 
   clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
-  (void) QueryColorCompliance("#0000",AllCompliance,&clone_info->fill,
+  (void) QueryColorCompliance("#000F",AllCompliance,&clone_info->fill,
     exception);
   resolution.x=DefaultResolution;
   resolution.y=DefaultResolution;
@@ -1420,7 +1420,7 @@
       (void) SetImageClipMask(image,clip_mask,exception);
       clip_mask=DestroyImage(clip_mask);
     }
-  (void) QueryColorCompliance("#00000000",AllCompliance,
+  (void) QueryColorCompliance("#000F",AllCompliance,
     &image->clip_mask->background_color,exception);
   image->clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
   (void) SetImageBackgroundColor(image->clip_mask,exception);
@@ -3495,7 +3495,7 @@
   image_info->size=AcquireString(geometry);
   *pattern=AcquireImage(image_info,exception);
   image_info=DestroyImageInfo(image_info);
-  (void) QueryColorCompliance("#00000000",AllCompliance,
+  (void) QueryColorCompliance("#000000FF",AllCompliance,
     &(*pattern)->background_color,exception);
   (void) SetImageBackgroundColor(*pattern,exception);
   if (image->debug != MagickFalse)
@@ -4748,9 +4748,9 @@
   (void) ResetMagickMemory(draw_info,0,sizeof(*draw_info));
   GetAffineMatrix(&draw_info->affine);
   exception=AcquireExceptionInfo();
-  (void) QueryColorCompliance("#000F",AllCompliance,&draw_info->fill,
+  (void) QueryColorCompliance("#0000",AllCompliance,&draw_info->fill,
     exception);
-  (void) QueryColorCompliance("#FFF0",AllCompliance,&draw_info->stroke,
+  (void) QueryColorCompliance("#FFFF",AllCompliance,&draw_info->stroke,
     exception);
   draw_info->stroke_width=1.0;
   draw_info->alpha=OpaqueAlpha;

MagickCore/montage.c

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 0708cf7..4e5a22e 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -818,7 +818,7 @@
               /*
                 Shadow image.
               */
-              (void) QueryColorCompliance("#00000000",AllCompliance,
+              (void) QueryColorCompliance("#000000",AllCompliance,
                 &image->background_color,exception);
               shadow_image=ShadowImage(image,80.0,2.0,0.0,5,5,exception);
               if (shadow_image != (Image *) NULL)