]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Mon, 10 Jun 2013 16:45:36 +0000 (16:45 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Mon, 10 Jun 2013 16:45:36 +0000 (16:45 +0000)
MagickCore/colorspace.c
MagickCore/enhance.c
MagickCore/pixel.c

index 15b98cbe58111ab540adf3adba079073ee4b5a99..1537c985b291cb9572b158cefa2fc6c3845431c7 100644 (file)
@@ -803,7 +803,8 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       /*
         Initialize YCbCr tables (ITU-R BT.709):
 
-          Y =  0.212656*R+0.715158*G+0.072186*B
+          Y =  0.21258623078559555160*R+0.71517030370341084990*G+
+               0.07220049864333622685*B
           Cb= -0.114572*R-0.385428*G+0.500000*B
           Cr=  0.500000*R-0.454153*G-0.045847*B
 
@@ -818,9 +819,9 @@ static MagickBooleanType sRGBTransformImage(Image *image,
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
-        x_map[i].x=(MagickRealType) (0.212656*(double) i);
-        y_map[i].x=(MagickRealType) (0.715158*(double) i);
-        z_map[i].x=(MagickRealType) (0.072186*(double) i);
+        x_map[i].x=(MagickRealType) (0.21258623078559555160*(double) i);
+        y_map[i].x=(MagickRealType) (0.71517030370341084990*(double) i);
+        z_map[i].x=(MagickRealType) (0.07220049864333622685*(double) i);
         x_map[i].y=(MagickRealType) (-0.114572*(double) i);
         y_map[i].y=(MagickRealType) (-0.385428*(double) i);
         z_map[i].y=(MagickRealType) (0.500000*(double) i);
index 737e2a95837c51f0092ac65c27d48aec4cc2ce8d..6186091ea7db198fa4d953e30315983822341396 100644 (file)
@@ -2088,7 +2088,8 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image,
               green=EncodePixelGamma(green);
               blue=EncodePixelGamma(blue);
             }
-          intensity=0.212656*red+0.715158*green+0.072186*blue;
+          intensity=0.21258623078559555160*red+0.71517030370341084990*
+            green+0.07220049864333622685*blue;
           break;
         }
         case Rec709LuminancePixelIntensityMethod:
@@ -2099,7 +2100,8 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image,
               green=DecodePixelGamma(green);
               blue=DecodePixelGamma(blue);
             }
-          intensity=0.212656*red+0.715158*green+0.072186*blue;
+          intensity=0.21258623078559555160*red+0.71517030370341084990*
+            green+0.07220049864333622685*blue;
           break;
         }
         case RMSPixelIntensityMethod:
index ec0fab67c21a89fbfc7d426368eb8eb1c819a13c..7149fec0f449619a47dede86f6141d751003b6dc 100644 (file)
@@ -2137,8 +2137,10 @@ MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel)
 %
 %    Rec601Luma       0.298839R' + 0.586811G' + 0.114350B'
 %    Rec601Luminance  0.298839R + 0.586811G + 0.114350B
-%    Rec709Luma       0.212656R' + 0.715158G' + 0.072186B'
-%    Rec709Luminance  0.212656R + 0.715158G + 0.072186B
+%    Rec709Luma       0.21258623078559555160R' + 0.71517030370341084990G' +
+%                     0.07220049864333622685B'
+%    Rec709Luminance  0.21258623078559555160R + 0.71517030370341084990G +
+%                     0.07220049864333622685B
 %    Brightness       max(R', G', B')
 %    Lightness        (min(R', G', B') + max(R', G', B')) / 2.0
 % 
@@ -2244,7 +2246,8 @@ MagickExport MagickRealType GetPixelIntensity(const Image *restrict image,
           green=EncodePixelGamma(green);
           blue=EncodePixelGamma(blue);
         }
-      intensity=0.212656*red+0.715158*green+0.072186*blue;
+      intensity=0.21258623078559555160*red+0.71517030370341084990*green+
+        0.07220049864333622685*blue;
       break;
     }
     case Rec709LuminancePixelIntensityMethod:
@@ -2255,7 +2258,8 @@ MagickExport MagickRealType GetPixelIntensity(const Image *restrict image,
           green=DecodePixelGamma(green);
           blue=DecodePixelGamma(blue);
         }
-      intensity=0.212656*red+0.715158*green+0.072186*blue;
+      intensity=0.21258623078559555160*red+0.71517030370341084990*green+
+        0.07220049864333622685*blue;
       break;
     }
     case RMSPixelIntensityMethod: