]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Wed, 7 Dec 2016 23:34:32 +0000 (18:34 -0500)
committerCristy <urban-warrior@imagemagick.org>
Wed, 7 Dec 2016 23:34:32 +0000 (18:34 -0500)
MagickCore/compare.c
MagickWand/mogrify.c
MagickWand/operation.c

index 8917bf8afbc972a57a60d80ebdb63457e748c357..68acaca5176cd37533bc86a732a942065f67f1e2 100644 (file)
@@ -205,15 +205,15 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
     }
   (void) SetImageAlphaChannel(highlight_image,OpaqueAlphaChannel,exception);
   (void) QueryColorCompliance("#f1001ecc",AllCompliance,&highlight,exception);
-  artifact=GetImageArtifact(image,"highlight-color");
+  artifact=GetImageArtifact(image,"compare:highlight-color");
   if (artifact != (const char *) NULL)
     (void) QueryColorCompliance(artifact,AllCompliance,&highlight,exception);
   (void) QueryColorCompliance("#ffffffcc",AllCompliance,&lowlight,exception);
-  artifact=GetImageArtifact(image,"lowlight-color");
+  artifact=GetImageArtifact(image,"compare:lowlight-color");
   if (artifact != (const char *) NULL)
     (void) QueryColorCompliance(artifact,AllCompliance,&lowlight,exception);
   (void) QueryColorCompliance("#888888cc",AllCompliance,&masklight,exception);
-  artifact=GetImageArtifact(image,"masklight-color");
+  artifact=GetImageArtifact(image,"compare:masklight-color");
   if (artifact != (const char *) NULL)
     (void) QueryColorCompliance(artifact,AllCompliance,&masklight,exception);
   /*
index 30369dc523290c1cee273aaa03917f30d2c185ac..e1472b43c763b19e1dbd1b41066710fe6a85af09 100644 (file)
@@ -1830,7 +1830,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
       {
         if (LocaleCompare("highlight-color",option+1) == 0)
           {
-            (void) SetImageArtifact(*image,option+1,argv[i+1]);
+            (void) SetImageArtifact(*image,"compare:highlight-color",argv[i+1]);
             break;
           }
         if (LocaleCompare("hough-lines",option+1) == 0)
@@ -2087,7 +2087,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
           }
         if (LocaleCompare("lowlight-color",option+1) == 0)
           {
-            (void) SetImageArtifact(*image,option+1,argv[i+1]);
+            (void) SetImageArtifact(*image,"compare:lowlight-color",argv[i+1]);
             break;
           }
         break;
index 076889d30acbeb040d1e1d058cacde1d4ea9d18a..e0b7548c144110986c9516c16400c60514d4ee63 100644 (file)
@@ -962,7 +962,8 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand,
         {
           /* FUTURE: this is only used by CompareImages() which is used
              only by the "compare" CLI program at this time.  */
-          (void) SetImageOption(_image_info,option+1,ArgOption(NULL));
+          (void) SetImageOption(_image_info,"compare:highlight-color",
+            ArgOption(NULL));
           break;
         }
       CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option);
@@ -1086,7 +1087,8 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand,
         {
           /* FUTURE: this is only used by CompareImages() which is used
              only by the "compare" CLI program at this time.  */
-          (void) SetImageOption(_image_info,option+1,ArgOption(NULL));
+          (void) SetImageOption(_image_info,"compare:lowlight-color",
+            ArgOption(NULL));
           break;
         }
       if (LocaleCompare("loop",option+1) == 0)