(no commit message)

diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index fafb48e81c49a5d3935a2cf39d691ba92d28d9d6..407c20b641056c8a4868c9856d92af2b47f602b2 100644 (file)
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -1289,6 +1289,7 @@ int main( int /*argc*/, char ** argv)
         image.signature() != "6a989010d8ea958934ff8be44a42e0848f7c5e7e46cd53e04c4a90452c15d34c" &&
         image.signature() != "7e5977b8bce5c40b858c84344803dae61feae0ef7a21739b2d068c9cdb72f95b" &&
         image.signature() != "c8aed4b60d666e449f5c29d0fb32f089e3257422a1f11a4712451c5340362df0" &&
+        image.signature() != "bc272b75794971f4a3ade1bf524c0aee375765e9fb15d65278a8b9452b551ea6" &&
    image.signature() != "b891ddb1d32cd45c6329180e5bd733eebb8dd06c401a9c721841ec43e4a662f8")
       {
        ++failures;

diff --git a/magick/color.c b/magick/color.c
index 28378d6d8b4f7ef0529705f85a80a87b322ddb7a..56653d8196b5b632d164790dba3f914c79cfb41c 100644 (file)
--- a/magick/color.c
+++ b/magick/color.c
@@ -79,10 +79,12 @@ typedef struct _ColorMapInfo
   const char
     *name;
 
-  const float
+  const unsigned char
     red,
     green,
-    blue,
+    blue;
+
+  const float
     alpha;
 
   const ssize_t
@@ -308,7 +310,7 @@ static const ColorMapInfo
     { "gray48", 122, 122, 122, 1, X11Compliance | XPMCompliance },
     { "gray49", 125, 125, 125, 1, X11Compliance | XPMCompliance },
     { "gray5", 13, 13, 13, 1, X11Compliance | XPMCompliance },
-    { "gray50", 127.5, 127.5, 127.5, 1, X11Compliance | XPMCompliance },
+    { "gray50", 127, 127, 127, 1, X11Compliance | XPMCompliance },
     { "gray51", 130, 130, 130, 1, X11Compliance | XPMCompliance },
     { "gray52", 133, 133, 133, 1, X11Compliance | XPMCompliance },
     { "gray53", 135, 135, 135, 1, X11Compliance | XPMCompliance },
@@ -2187,9 +2189,6 @@ static MagickBooleanType LoadColorLists(const char *filename,
   LinkedListInfo
     *options;
 
-  MagickRealType
-    scale;
-
   MagickStatusType
     status;
 
@@ -2210,7 +2209,6 @@ static MagickBooleanType LoadColorLists(const char *filename,
           return(MagickFalse);
         }
     }
-  scale=(MagickRealType) ScaleCharToQuantum(1);
   for (i=0; i < (ssize_t) (sizeof(ColorMap)/sizeof(*ColorMap)); i++)
   {
     ColorInfo
@@ -2231,9 +2229,12 @@ static MagickBooleanType LoadColorLists(const char *filename,
     color_info->path=(char *) "[built-in]";
     color_info->name=(char *) p->name;
     GetMagickPixelPacket((Image *) NULL,&color_info->color);
-    color_info->color.red=scale*GetRedPixelComponent(p);
-    color_info->color.green=scale*GetGreenPixelComponent(p);
-    color_info->color.blue=scale*GetBluePixelComponent(p);
+    color_info->color.red=(MagickRealType) ScaleCharToQuantum(
+      GetRedPixelComponent(p));
+    color_info->color.green=(MagickRealType) ScaleCharToQuantum(
+      GetGreenPixelComponent(p));
+    color_info->color.blue=(MagickRealType) ScaleCharToQuantum(
+      GetBluePixelComponent(p));
     color_info->color.opacity=(MagickRealType) (QuantumRange-QuantumRange*
       p->alpha);
     color_info->compliance=(ComplianceType) p->compliance;