From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 11 Jan 2012 01:45:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6410
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1d78183060a8db0a8ce067414c62f23ba586de7;p=imagemagick

---

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 456b13d15..d7202e277 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -2277,18 +2277,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               geometry_info.sigma,exception);
             break;
           }
-        if (LocaleCompare("pen",option+1) == 0)
-          {
-            if (*option == '+')
-              {
-                (void) QueryColorCompliance("none",AllCompliance,
-                  &draw_info->fill,exception);
-                break;
-              }
-            (void) QueryColorCompliance(argv[i+1],AllCompliance,
-              &draw_info->fill,exception);
-            break;
-          }
         if (LocaleCompare("pointsize",option+1) == 0)
           {
             if (*option == '+')
@@ -6912,16 +6900,6 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             (void) CloneString(&image_info->page,page);
             break;
           }
-        if (LocaleCompare("pen",option+1) == 0)
-          {
-            if (*option == '+')
-              {
-                (void) SetImageOption(image_info,option+1,"none");
-                break;
-              }
-            (void) SetImageOption(image_info,option+1,argv[i+1]);
-            break;
-          }
         if (LocaleCompare("ping",option+1) == 0)
           {
             image_info->ping=(*option == '-') ? MagickTrue : MagickFalse;
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 26594ab14..e73ce104e 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -275,7 +275,7 @@ static struct
       {"pointsize", RealReference}, {"density", StringReference},
       {"undercolor", StringReference}, {"stroke", StringReference},
       {"fill", StringReference}, {"geometry", StringReference},
-      {"pen", StringReference}, {"x", RealReference},
+      {"sans", StringReference}, {"x", RealReference},
       {"y", RealReference}, {"gravity", MagickGravityOptions},
       {"translate", StringReference}, {"scale", StringReference},
       {"rotate", RealReference}, {"skewX", RealReference},
@@ -1797,12 +1797,6 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
           geometry=(char *) RelinquishMagickMemory(geometry);
           break;
         }
-      if (LocaleCompare(attribute,"pen") == 0)
-        {
-          if (info)
-            (void) SetImageOption(info->image_info,"fill",SvPV(sval,na));
-          break;
-        }
       if (LocaleNCompare(attribute,"pixel",5) == 0)
         {
           int