(no commit message)

diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index e10d2c0ef460537222c0662a871475d3d2f5795f..a0e14a05356a96b5f1e7b40036bdee6bed4e1bac 100644 (file)
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -457,8 +457,8 @@ MagickPrivate void ConvertLCHabToRGB(const double luma,const double chroma,
   L=luma;
   C=chroma;
   H=hue;
-  a=C*cos(360.0*H*MagickPI/180.0);
-  b=C*sin(360.0*H*MagickPI/180.0);
+  a=C*cos(360.0*H*MagickPI/180.0)+0.5;
+  b=C*sin(360.0*H*MagickPI/180.0)+0.5;
   ConvertLabToXYZ(L,a,b,&X,&Y,&Z);
   ConvertXYZToRGB(X,Y,Z,red,green,blue);
 }
@@ -512,8 +512,8 @@ MagickPrivate void ConvertLCHuvToRGB(const double luma,const double chroma,
   L=luma;
   C=chroma;
   H=hue;
-  u=C*cos(360.0*H*MagickPI/180.0);
-  v=C*sin(360.0*H*MagickPI/180.0);
+  u=(C*cos(360.0*H*MagickPI/180.0)+134.0)/354.0;
+  v=(C*sin(360.0*H*MagickPI/180.0)+140.0)/262.0;
   ConvertLuvToXYZ(L,u,v,&X,&Y,&Z);
   ConvertXYZToRGB(X,Y,Z,red,green,blue);
 }

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 3d9ce63413bef31d1406ce9ffeac4da218062075..48d32699b657dea3864e2b497b287e81cd1c2ab9 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -2167,6 +2167,12 @@ MagickExport MagickRealType GetPixelIntensity(const Image *restrict image,
       intensity=MagickMin(MagickMin(red,green),blue);
       break;
     }
+    case MSPixelIntensityMethod:
+    {
+      intensity=(MagickRealType) (((double) red*red+green*green+blue*blue)/
+        (3.0*QuantumRange));
+      break;
+    }
     case Rec601LumaPixelIntensityMethod:
     {
       intensity=0.298839f*red+0.586811f*green+0.114350f*blue;
@@ -2202,7 +2208,8 @@ MagickExport MagickRealType GetPixelIntensity(const Image *restrict image,
     }
     case RMSPixelIntensityMethod:
     {
-      intensity=(MagickRealType) sqrt((double) red*red+green*green+blue*blue);
+      intensity=(MagickRealType) (sqrt((double) red*red+green*green+blue*blue)/
+        sqrt(3.0));
       break;
     }
   }