(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index e40606a4756b3f8cb9294102eefe80d0ac58a810..3be7d4a04ebf7a51c08271687f42b34e3f3e89ff 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1950,7 +1950,8 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
       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);

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 477aeb4ceda669dfffc7b0f0968de669024e6761..265c5eeb6c304d4d916cf7047bf58cb9169fac27 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -161,14 +161,11 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
       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);

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index a5120283093e35f7feb5d62b17be77251fe3775d..a464522391a73bd4fa42a7910f972e1cbcaa9529 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1270,7 +1270,7 @@ static void DrawBoundingRectangles(Image *image,const DrawInfo *draw_info,
     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 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
       (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 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image,
   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 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
   (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;

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 0708cf727912b7a9119e25bc57a1ff6810f2d16a..4e5a22e472558da99d5ffe6a189c68cc1e305c5a 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -818,7 +818,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
               /*
                 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)

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 4dcffd095b8fcbda345d3a8fa10174632334f1d5..7b3dbfc916a69505fb8167cab46ccc03ffe2a984 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -10666,10 +10666,10 @@ Mogrify(ref,...)
             black_point,
             white_point;
 
-          (void) QueryColorCompliance("#000000",AllCompliance,
-            &black_point,exception);
-          (void) QueryColorCompliance("#ffffff",AllCompliance,
-            &white_point,exception);
+          (void) QueryColorCompliance("#000000",AllCompliance,&black_point,
+            exception);
+          (void) QueryColorCompliance("#ffffff",AllCompliance,&white_point,
+            exception);
           if (attribute_flag[1] != 0)
              (void) QueryColorCompliance(
                argument_list[1].string_reference,AllCompliance,&black_point,

diff --git a/coders/histogram.c b/coders/histogram.c
index aa88e979d030671a6f4a2b35e4a5a4c238f7f96d..f3495397d780b7cae63804b604b51e0024c93e3c 100644 (file)
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -292,12 +292,13 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   /*
     Initialize histogram image.
   */
-  (void) QueryColorCompliance("#000000",AllCompliance,
+  (void) QueryColorCompliance("#000",AllCompliance,
     &histogram_image->background_color,exception);
   (void) SetImageBackgroundColor(histogram_image,exception);
   for (x=0; x < (ssize_t) histogram_image->columns; x++)
   {
-    q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);
+    q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,
+      exception);
     if (q == (Quantum *) NULL)
       break;
     if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)

diff --git a/coders/svg.c b/coders/svg.c
index 0c4f87eb6c6437d12d5862bf7891e1b571aaf0df..3e969b6b8853561485d22c0a76e497d5d3a516d2 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -1657,15 +1657,15 @@ static void SVGStartElement(void *context,const xmlChar *name,
                          if (LocaleCompare(value,"currentColor") == 0)
                            {
                              (void) FormatLocaleFile(svg_info->file,
-                          "fill '%s'\n",color);
+                               "fill '%s'\n",color);
                              break;
                            }
-                        if (LocaleCompare(value,"#00000000") == 0)
+                        if (LocaleCompare(value,"#000000FF") == 0)
                           (void) FormatLocaleFile(svg_info->file,
-                          "fill '#000000'\n");
+                            "fill '#000000'\n");
                         else
                           (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",
-                          value);
+                            value);
                         break;
                       }
                     if (LocaleCompare(keyword,"fillcolor") == 0)
@@ -1747,18 +1747,18 @@ static void SVGStartElement(void *context,const xmlChar *name,
                       }
                     if (LocaleCompare(keyword,"stroke") == 0)
                       {
-                         if (LocaleCompare(value,"currentColor") == 0)
-                           {
-                             (void) FormatLocaleFile(svg_info->file,
-                          "stroke '%s'\n",color);
-                             break;
-                           }
-                        if (LocaleCompare(value,"#00000000") == 0)
+                        if (LocaleCompare(value,"currentColor") == 0)
+                          {
+                            (void) FormatLocaleFile(svg_info->file,
+                              "stroke '%s'\n",color);
+                            break;
+                          }
+                        if (LocaleCompare(value,"#000000FF") == 0)
                           (void) FormatLocaleFile(svg_info->file,
-                          "fill '#000000'\n");
+                            "fill '#000000'\n");
                         else
                           (void) FormatLocaleFile(svg_info->file,
-                          "stroke '%s'\n",value);
+                            "stroke '%s'\n",value);
                         break;
                       }
                     if (LocaleCompare(keyword,"stroke-antialiasing") == 0)

diff --git a/coders/wmf.c b/coders/wmf.c
index 54f9cfcf3386f663c22df43063bc39feb8f22444..e693defe4a3804a1b687b685e6caddd273ee37ac 100644 (file)
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -890,10 +890,9 @@ static void ipa_device_begin(wmfAPI * API)
             ddata->pattern_id);
           (void) DrawSetFillPatternURL(WmfDrawingWand,pattern_id);
           ++ddata->pattern_id;
-
           DrawRectangle(WmfDrawingWand,
-                         XC(ddata->bbox.TL.x),YC(ddata->bbox.TL.y),
-                         XC(ddata->bbox.BR.x),YC(ddata->bbox.BR.y));
+            XC(ddata->bbox.TL.x),YC(ddata->bbox.TL.y),
+            XC(ddata->bbox.BR.x),YC(ddata->bbox.BR.y));
           image=DestroyImageList(image);
         }
       else
@@ -1941,7 +1940,6 @@ static void util_set_brush(wmfAPI * API, wmfDC * dc, const BrushApply brush_appl
 
               (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu",
                 ddata->pattern_id);
-
               if ( brush_apply == BrushApplyStroke )
                 (void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id);
               else