Changeset 8255

Timestamp:

06/13/12 20:56:42 (11 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6/magick

Files:

• color-private.h (modified) (5 diffs)
• colorspace.c (modified) (11 diffs)
• xwindow-private.h (modified) (1 diff)
• xwindow.c (modified) (1 diff)

ImageMagick/branches/ImageMagick-6/magick/color-private.h

@@ -108 +108 @@
   const MagickPixelPacket *pixel)
 {
-  return((MagickRealType) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue));
+  return((MagickRealType) (0.298839*pixel->red+0.586811*pixel->green+0.114350*pixel->blue));
 }
 
@@ -115 +115 @@
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue+0.5));
+  return((Quantum) (0.298839*pixel->red+0.586811*pixel->green+0.114350*pixel->blue+0.5));
 #else
-  return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue));
+  return((Quantum) (0.298839*pixel->red+0.586811*pixel->green+0.114350*pixel->blue));
 #endif
 }
@@ -139 +139 @@
       (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
     return((MagickRealType) pixel->red);
-  intensity=(MagickRealType) (0.299*GetPixelRed(pixel)+0.587*
-    GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel));
+  intensity=(MagickRealType) (0.298839*GetPixelRed(pixel)+0.586811*
+    GetPixelGreen(pixel)+0.114350*GetPixelBlue(pixel));
   return(intensity);
 }
@@ -150 +150 @@
       (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
     return(GetPixelRed(pixel));
-  return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
-    GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)+0.5));
+  return((Quantum) (0.298839*GetPixelRed(pixel)+0.586811*
+    GetPixelGreen(pixel)+0.114350*GetPixelBlue(pixel)+0.5));
 #else
   {
@@ -160 +160 @@
     alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
     beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
-    if ((fabs((double) alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
+    if ((fabs((double) alpha) <= MagickEpsilon) &&
+        (fabs(beta) <= MagickEpsilon))
       return(GetPixelRed(pixel));
-    return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
-      GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)));
+    return((Quantum) (0.298839*GetPixelRed(pixel)+0.586811*
+      GetPixelGreen(pixel)+0.114350*GetPixelBlue(pixel)));
   }
 #endif

ImageMagick/branches/ImageMagick-6/magick/colorspace.c

@@ -821 +821 @@
         Initialize Rec601 luma tables:
 
-          G = 0.29900*R+0.58700*G+0.11400*B
+          G = 0.298839*R+0.586811*G+0.114350*B
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -829 +829 @@
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
-        x_map[i].x=0.29900f*(MagickRealType) i;
-        y_map[i].x=0.58700f*(MagickRealType) i;
-        z_map[i].x=0.11400f*(MagickRealType) i;
-        x_map[i].y=0.29900f*(MagickRealType) i;
-        y_map[i].y=0.58700f*(MagickRealType) i;
-        z_map[i].y=0.11400f*(MagickRealType) i;
-        x_map[i].z=0.29900f*(MagickRealType) i;
-        y_map[i].z=0.58700f*(MagickRealType) i;
-        z_map[i].z=0.11400f*(MagickRealType) i;
+        x_map[i].x=0.298839f*(MagickRealType) i;
+        y_map[i].x=0.586811f*(MagickRealType) i;
+        z_map[i].x=0.114350f*(MagickRealType) i;
+        x_map[i].y=0.298839f*(MagickRealType) i;
+        y_map[i].y=0.586811f*(MagickRealType) i;
+        z_map[i].y=0.114350f*(MagickRealType) i;
+        x_map[i].z=0.298839f*(MagickRealType) i;
+        y_map[i].z=0.586811f*(MagickRealType) i;
+        z_map[i].z=0.114350f*(MagickRealType) i;
       }
       image->type=GrayscaleType;
@@ -848 +848 @@
         Initialize YCbCr tables (ITU-R BT.601):
 
-          Y =  0.299000*R+0.587000*G+0.114000*B
+          Y =  0.2988390*R+0.5868110*G+0.1143500*B
           Cb= -0.168736*R-0.331264*G+0.500000*B
           Cr=  0.500000*R-0.418688*G-0.081312*B
@@ -863 +863 @@
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
-        x_map[i].x=0.299000f*(MagickRealType) i;
-        y_map[i].x=0.587000f*(MagickRealType) i;
-        z_map[i].x=0.114000f*(MagickRealType) i;
+        x_map[i].x=0.2988390f*(MagickRealType) i;
+        y_map[i].x=0.5868110f*(MagickRealType) i;
+        z_map[i].x=0.1143500f*(MagickRealType) i;
         x_map[i].y=(-0.168730f)*(MagickRealType) i;
         y_map[i].y=(-0.331264f)*(MagickRealType) i;
@@ -968 +968 @@
         Initialize YCC tables:
 
-          Y =  0.29900*R+0.58700*G+0.11400*B
-          C1= -0.29900*R-0.58700*G+0.88600*B
-          C2=  0.70100*R-0.58700*G-0.11400*B
+          Y =  0.298839*R+0.586811*G+0.114350*B
+          C1= -0.298839*R-0.586811*G+0.88600*B
+          C2=  0.70100*R-0.586811*G-0.114350*B
 
         YCC is scaled by 1.3584.  C1 zero is 156 and C2 is at 137.
@@ -1007 +1007 @@
         Initialize YIQ tables:
 
-          Y = 0.29900*R+0.58700*G+0.11400*B
+          Y = 0.298839*R+0.586811*G+0.114350*B
           I = 0.59600*R-0.27400*G-0.32200*B
           Q = 0.21100*R-0.52300*G+0.31200*B
@@ -1022 +1022 @@
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
-        x_map[i].x=0.29900f*(MagickRealType) i;
-        y_map[i].x=0.58700f*(MagickRealType) i;
-        z_map[i].x=0.11400f*(MagickRealType) i;
+        x_map[i].x=0.298839f*(MagickRealType) i;
+        y_map[i].x=0.586811f*(MagickRealType) i;
+        z_map[i].x=0.114350f*(MagickRealType) i;
         x_map[i].y=0.59600f*(MagickRealType) i;
         y_map[i].y=(-0.27400f)*(MagickRealType) i;
@@ -1039 +1039 @@
         Initialize YPbPr tables (ITU-R BT.601):
 
-          Y =  0.299000*R+0.587000*G+0.114000*B
+          Y =  0.2988390*R+0.5868110*G+0.1143500*B
           Pb= -0.168736*R-0.331264*G+0.500000*B
           Pr=  0.500000*R-0.418688*G-0.081312*B
@@ -1054 +1054 @@
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
-        x_map[i].x=0.299000f*(MagickRealType) i;
-        y_map[i].x=0.587000f*(MagickRealType) i;
-        z_map[i].x=0.114000f*(MagickRealType) i;
+        x_map[i].x=0.2988390f*(MagickRealType) i;
+        y_map[i].x=0.5868110f*(MagickRealType) i;
+        z_map[i].x=0.1143500f*(MagickRealType) i;
         x_map[i].y=(-0.168736f)*(MagickRealType) i;
         y_map[i].y=(-0.331264f)*(MagickRealType) i;
@@ -1071 +1071 @@
         Initialize YUV tables:
 
-          Y =  0.29900*R+0.58700*G+0.11400*B
+          Y =  0.298839*R+0.586811*G+0.114350*B
           U = -0.14740*R-0.28950*G+0.43690*B
           V =  0.61500*R-0.51500*G-0.10000*B
@@ -1086 +1086 @@
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
-        x_map[i].x=0.29900f*(MagickRealType) i;
-        y_map[i].x=0.58700f*(MagickRealType) i;
-        z_map[i].x=0.11400f*(MagickRealType) i;
+        x_map[i].x=0.298839f*(MagickRealType) i;
+        y_map[i].x=0.586811f*(MagickRealType) i;
+        z_map[i].x=0.114350f*(MagickRealType) i;
         x_map[i].y=(-0.14740f)*(MagickRealType) i;
         y_map[i].y=(-0.28950f)*(MagickRealType) i;

ImageMagick/branches/ImageMagick-6/magick/xwindow-private.h

@@ -592 +592 @@
     intensity;
 
-  intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue;
+  intensity=0.298839*pixel->red+0.586811*pixel->green+0.114350*pixel->blue;
   return(intensity);
 }

ImageMagick/branches/ImageMagick-6/magick/xwindow.c

@@ -7650 +7650 @@
     intensity;
 
-  intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue;
+  intensity=0.298839*pixel->red+0.586811*pixel->green+0.114350*pixel->blue;
   return(intensity);
 }