From: dirk <dirk@git.imagemagick.org>
Date: Thu, 30 Jul 2015 18:47:36 +0000 (+0000)
Subject: Another attempt...
X-Git-Tag: 7.0.1-0~730
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd7357c467a9c44622d7ce716a71db1dd345cf91;p=imagemagick

Another attempt...
---

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index a0e7b9933..f2d1faf45 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4907,10 +4907,6 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
   option=GetImageOption(clone_info,"kerning");
   if (option != (const char *) NULL)
     draw_info->kerning=StringToDouble(option,(char **) NULL);
-  option=GetImageOption(clone_info,"style");
-  if (option != (const char *) NULL)
-    draw_info->style=(StyleType) ParseCommandOption(MagickStyleOptions,
-      MagickFalse,option);
   option=GetImageOption(clone_info,"stroke");
   if (option != (const char *) NULL)
     (void) QueryColorCompliance(option,AllCompliance,&draw_info->stroke,
@@ -4918,6 +4914,10 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
   option=GetImageOption(clone_info,"strokewidth");
   if (option != (const char *) NULL)
     draw_info->stroke_width=StringToDouble(option,(char **) NULL);
+  option=GetImageOption(clone_info,"style");
+  if (option != (const char *) NULL)
+    draw_info->style=(StyleType) ParseCommandOption(MagickStyleOptions,
+      MagickFalse,option);
   option=GetImageOption(clone_info,"undercolor");
   if (option != (const char *) NULL)
     (void) QueryColorCompliance(option,AllCompliance,&draw_info->undercolor,