(no commit message)

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 1fa6b44308d1c7cdc54ffdc756d83ac661b2a3b7..0086e3e423705a0a3309206a0ecc5a0bf2657a62 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4775,12 +4775,10 @@ 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,
     exception);
   (void) QueryColorCompliance("#FFF0",AllCompliance,&draw_info->stroke,
     exception);
-  draw_info->stroke_antialias=image_info->antialias;
   draw_info->stroke_width=1.0;
   draw_info->alpha=OpaqueAlpha;
   draw_info->fill_rule=EvenOddRule;
@@ -4788,57 +4786,63 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
   draw_info->linejoin=MiterJoin;
   draw_info->miterlimit=10;
   draw_info->decorate=NoDecoration;
-  if (image_info->font != (char *) NULL)
-    draw_info->font=AcquireString(image_info->font);
-  if (image_info->density != (char *) NULL)
-    draw_info->density=AcquireString(image_info->density);
-  draw_info->text_antialias=image_info->antialias;
   draw_info->pointsize=12.0;
-  if (image_info->pointsize != 0.0)
-    draw_info->pointsize=image_info->pointsize;
   draw_info->undercolor.alpha=(Quantum) TransparentAlpha;
-  draw_info->border_color=image_info->border_color;
   draw_info->compose=OverCompositeOp;
-  if (image_info->server_name != (char *) NULL)
-    draw_info->server_name=AcquireString(image_info->server_name);
   draw_info->render=MagickTrue;
   draw_info->debug=IsEventLogging();
-  option=GetImageOption(image_info,"encoding");
-  if (option != (const char *) NULL)
-    (void) CloneString(&draw_info->encoding,option);
-  option=GetImageOption(image_info,"kerning");
-  if (option != (const char *) NULL)
-    draw_info->kerning=InterpretLocaleValue(option,(char **) NULL);
-  option=GetImageOption(image_info,"interline-spacing");
-  if (option != (const char *) NULL)
-    draw_info->interline_spacing=InterpretLocaleValue(option,(char **) NULL);
-  draw_info->direction=UndefinedDirection;
-  option=GetImageOption(image_info,"interword-spacing");
-  if (option != (const char *) NULL)
-    draw_info->interword_spacing=InterpretLocaleValue(option,(char **) NULL);
-  option=GetImageOption(image_info,"direction");
-  if (option != (const char *) NULL)
-    draw_info->direction=(DirectionType) ParseCommandOption(
-      MagickDirectionOptions,MagickFalse,option);
-  option=GetImageOption(image_info,"fill");
-  if (option != (const char *) NULL)
-    (void) QueryColorCompliance(option,AllCompliance,&draw_info->fill,
-      exception);
-  option=GetImageOption(image_info,"stroke");
-  if (option != (const char *) NULL)
-    (void) QueryColorCompliance(option,AllCompliance,&draw_info->stroke,
-      exception);
-  option=GetImageOption(image_info,"strokewidth");
-  if (option != (const char *) NULL)
-    draw_info->stroke_width=InterpretLocaleValue(option,(char **) NULL);
-  option=GetImageOption(image_info,"undercolor");
-  if (option != (const char *) NULL)
-    (void) QueryColorCompliance(option,AllCompliance,&draw_info->undercolor,
-      exception);
-  option=GetImageOption(image_info,"gravity");
-  if (option != (const char *) NULL)
-    draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
-      MagickFalse,option);
+  if (image_info != (ImageInfo *) NULL)
+    {
+      draw_info->stroke_antialias=image_info->antialias;
+      if (image_info->font != (char *) NULL)
+        draw_info->font=AcquireString(image_info->font);
+      if (image_info->density != (char *) NULL)
+        draw_info->density=AcquireString(image_info->density);
+      draw_info->text_antialias=image_info->antialias;
+      if (image_info->pointsize != 0.0)
+        draw_info->pointsize=image_info->pointsize;
+      draw_info->border_color=image_info->border_color;
+      if (image_info->server_name != (char *) NULL)
+        draw_info->server_name=AcquireString(image_info->server_name);
+      option=GetImageOption(image_info,"encoding");
+      if (option != (const char *) NULL)
+        (void) CloneString(&draw_info->encoding,option);
+      option=GetImageOption(image_info,"kerning");
+      if (option != (const char *) NULL)
+        draw_info->kerning=InterpretLocaleValue(option,(char **) NULL);
+      option=GetImageOption(image_info,"interline-spacing");
+      if (option != (const char *) NULL)
+        draw_info->interline_spacing=InterpretLocaleValue(option,
+          (char **) NULL);
+      draw_info->direction=UndefinedDirection;
+      option=GetImageOption(image_info,"interword-spacing");
+      if (option != (const char *) NULL)
+        draw_info->interword_spacing=InterpretLocaleValue(option,
+          (char **) NULL);
+      option=GetImageOption(image_info,"direction");
+      if (option != (const char *) NULL)
+        draw_info->direction=(DirectionType) ParseCommandOption(
+          MagickDirectionOptions,MagickFalse,option);
+      option=GetImageOption(image_info,"fill");
+      if (option != (const char *) NULL)
+        (void) QueryColorCompliance(option,AllCompliance,&draw_info->fill,
+          exception);
+      option=GetImageOption(image_info,"stroke");
+      if (option != (const char *) NULL)
+        (void) QueryColorCompliance(option,AllCompliance,&draw_info->stroke,
+          exception);
+      option=GetImageOption(image_info,"strokewidth");
+      if (option != (const char *) NULL)
+        draw_info->stroke_width=InterpretLocaleValue(option,(char **) NULL);
+      option=GetImageOption(image_info,"undercolor");
+      if (option != (const char *) NULL)
+        (void) QueryColorCompliance(option,AllCompliance,&draw_info->undercolor,
+          exception);
+      option=GetImageOption(image_info,"gravity");
+      if (option != (const char *) NULL)
+        draw_info->gravity=(GravityType) ParseCommandOption(
+          MagickGravityOptions,MagickFalse,option);
+    }
   exception=DestroyExceptionInfo(exception);
   draw_info->signature=MagickSignature;
 }

diff --git a/PerlMagick/t/filter.t b/PerlMagick/t/filter.t
index 893b1ba144fb085b9c6c0545123288496f0fb720..ef85554c5d8cace99225129fc6c5e3da24053696 100644 (file)
--- a/PerlMagick/t/filter.t
+++ b/PerlMagick/t/filter.t
@@ -54,7 +54,7 @@ testFilterCompare('input.miff',  q//, 'reference/filter/Charcoal.miff', 'Charcoa
 testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/ColorFloodfill.miff', 'ColorFloodfill', q/geometry=>"+25+45"/, 0.03, 1.02);
 ++$test;
 
-testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Colorize.miff', 'Colorize', q/fill=>"red", opacity=>"50%"/, 0.02, 0.5 );
+testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Colorize.miff', 'Colorize', q/fill=>"red", blend=>"50%"/, 0.02, 0.5 );
 ++$test;
 
 testFilterCompare('input.miff',  q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.06, 0.6);