diff --git a/coders/histogram.c b/coders/histogram.c
index aa88e97..f349539 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -292,12 +292,13 @@
/*
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 0c4f87e..3e969b6 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -1657,15 +1657,15 @@
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 @@
}
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 54f9cfc..e693def 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -890,10 +890,9 @@
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 @@
(void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu",
ddata->pattern_id);
-
if ( brush_apply == BrushApplyStroke )
(void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id);
else