commit 269c9413034627692b2a7d0a352f9dee4e8eada8
author cristy <urban-warrior@git.imagemagick.org> Thu Oct 13 23:41:15 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Oct 13 23:41:15 2011 +0000
tree 4f7188ee79f7eecdd8b187dede62cf6f6cda8ebb
parent c6e9179e0181ba6599e5f03c30996100dac1716f

coders/msl.c

diff --git a/coders/msl.c b/coders/msl.c
index f336015..d1190c3 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1413,7 +1413,7 @@
                 {
                   if (LocaleCompare(keyword,"fill") == 0)
                     {
-                      (void) QueryMagickColorCompliance(value,AllCompliance,
+                      (void) QueryColorCompliance(value,AllCompliance,
                         &target,&msl_info->image[n]->exception);
                       break;
                     }
@@ -1659,7 +1659,7 @@
                 {
                   if (LocaleCompare(keyword,"bordercolor") == 0)
                     {
-                      (void) QueryMagickColorCompliance(value,AllCompliance,
+                      (void) QueryColorCompliance(value,AllCompliance,
                         &target,&exception);
                       paint_method=FillToBorderMethod;
                       break;
@@ -3688,7 +3688,7 @@
                 {
                   if (LocaleCompare(keyword,"bordercolor") == 0)
                     {
-                      (void) QueryMagickColorCompliance(value,AllCompliance,
+                      (void) QueryColorCompliance(value,AllCompliance,
                         &target,&exception);
                       paint_method=FillToBorderMethod;
                       break;
@@ -4225,9 +4225,9 @@
                 (const char *) tag);
               break;
             }
-          (void) QueryMagickColorCompliance("none",AllCompliance,&target,
+          (void) QueryColorCompliance("none",AllCompliance,&target,
             &exception);
-          (void) QueryMagickColorCompliance("none",AllCompliance,&fill_color,
+          (void) QueryColorCompliance("none",AllCompliance,&fill_color,
             &exception);
           if (attributes != (const xmlChar **) NULL)
             for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
@@ -4260,7 +4260,7 @@
                 {
                   if (LocaleCompare(keyword,"fill") == 0)
                     {
-                      (void) QueryMagickColorCompliance(value,AllCompliance,
+                      (void) QueryColorCompliance(value,AllCompliance,
                         &fill_color,&exception);
                       break;
                     }
@@ -7198,7 +7198,7 @@
                 PixelInfo
                   target;
 
-                (void) QueryMagickColorCompliance(value,AllCompliance,&target,
+                (void) QueryColorCompliance(value,AllCompliance,&target,
                   &exception);
                 (void) TransparentPaintImage(msl_info->image[n],&target,
                   TransparentAlpha,MagickFalse,&msl_info->image[n]->exception);

coders/svg.c

diff --git a/coders/svg.c b/coders/svg.c
index 5db0096..6bff30f 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3399,7 +3399,7 @@
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         SetPixelInfo(image,p,&pixel);
-        (void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
+        (void) QueryColorname(image,&pixel,SVGCompliance,tuple,
           &image->exception);
         (void) FormatLocaleString(message,MaxTextExtent,
           "  <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",

coders/txt.c

diff --git a/coders/txt.c b/coders/txt.c
index db0cda3..3f6cbdd 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -697,7 +697,7 @@
         (void) FormatLocaleString(buffer,MaxTextExtent,"%s",tuple);
         (void) WriteBlobString(image,buffer);
         (void) WriteBlobString(image,"  ");
-        (void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,exception);
+        (void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception);
         (void) WriteBlobString(image,tuple);
         (void) WriteBlobString(image,"\n");
         p+=GetPixelChannels(image);

coders/xc.c

diff --git a/coders/xc.c b/coders/xc.c
index d15fe41..1664ae8 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -127,7 +127,7 @@
   if (image->rows == 0)
     image->rows=1;
   (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
-  status=QueryMagickColorCompliance((char *) image_info->filename,AllCompliance,
+  status=QueryColorCompliance((char *) image_info->filename,AllCompliance,
     &color,exception);
   if (status == MagickFalse)
     {

coders/xpm.c

diff --git a/coders/xpm.c b/coders/xpm.c
index 1b16ce2..f07adc3 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -741,7 +741,7 @@
     pixel.colorspace=RGBColorspace;
     pixel.depth=8;
     pixel.alpha=(MagickRealType) OpaqueAlpha;
-    (void) QueryMagickColorname(image,&pixel,XPMCompliance,name,exception);
+    (void) QueryColorname(image,&pixel,XPMCompliance,name,exception);
     if (transparent != MagickFalse)
       {
         if (i == (ssize_t) (colors-1))
@@ -977,7 +977,7 @@
     pixel.colorspace=RGBColorspace;
     pixel.depth=8;
     pixel.alpha=(MagickRealType) OpaqueAlpha;
-    (void) QueryMagickColorname(image,&pixel,XPMCompliance,name,exception);
+    (void) QueryColorname(image,&pixel,XPMCompliance,name,exception);
     if (i == opacity)
       (void) CopyMagickString(name,"None",MaxTextExtent);
     /*