(no commit message)

diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index 0628c96efe6446b59e9b302070ab4a64cc869e66..a339ed236ff6e0896580e72a593f2b1c8f990cf9 100644 (file)
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -350,7 +350,7 @@ int main( int /*argc*/, char ** argv)
       // Test default setting
       double x, y;
       image.chromaBluePrimary( &x, &y );
-      if ( x != 0 || y != 0 )
+      if ( x != 0.1500 || y != 0.0600 )
        {
          ++failures;
          cout << "Line: " << __LINE__
@@ -376,7 +376,7 @@ int main( int /*argc*/, char ** argv)
       // Test default setting
       double x, y;
       image.chromaGreenPrimary( &x, &y );
-      if ( x != 0 || y != 0 )
+      if ( x != 0.3000 || y != 0.6000 )
        {
          ++failures;
          cout << "Line: " << __LINE__
@@ -401,7 +401,7 @@ int main( int /*argc*/, char ** argv)
       // Test default setting
       double x, y;
       image.chromaRedPrimary( &x, &y );
-      if ( x != 0 || y != 0 )
+      if ( x != 0.6400 || y != 0.3300 )
        {
          ++failures;
          cout << "Line: " << __LINE__
@@ -426,7 +426,7 @@ int main( int /*argc*/, char ** argv)
       // Test default setting
       double x, y;
       image.chromaWhitePoint( &x, &y );
-      if ( x != 0 || y != 0 )
+      if ( x != 0.3127 || y != 0.3290 )
        {
          ++failures;
          cout << "Line: " << __LINE__

diff --git a/MagickCore/image.c b/MagickCore/image.c
index dae5ba27d9268b98a0d3ee80529b98ef84e69f6b..07d4075440c7ce36238d7a17ccad752f60aa84d8 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -175,14 +175,14 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
   image->colorspace=sRGBColorspace;
   image->rendering_intent=PerceptualIntent;
   image->gamma=0.45455;
-  image->chromaticity.red_primary.x=0.6400f;
-  image->chromaticity.red_primary.y=0.3300f;
-  image->chromaticity.green_primary.x=0.3000f;
-  image->chromaticity.green_primary.y=0.6000f;
-  image->chromaticity.blue_primary.x=0.1500f;
-  image->chromaticity.blue_primary.y=0.0600f;
-  image->chromaticity.white_point.x=0.3127f;
-  image->chromaticity.white_point.y=0.3290f;
+  image->chromaticity.red_primary.x=0.6400;
+  image->chromaticity.red_primary.y=0.3300;
+  image->chromaticity.green_primary.x=0.3000;
+  image->chromaticity.green_primary.y=0.6000;
+  image->chromaticity.blue_primary.x=0.1500;
+  image->chromaticity.blue_primary.y=0.0600;
+  image->chromaticity.white_point.x=0.3127;
+  image->chromaticity.white_point.y=0.3290;
   image->interlace=NoInterlace;
   image->ticks_per_second=UndefinedTicksPerSecond;
   image->compose=OverCompositeOp;