(no commit message)

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 0d4116f4b0548b5a7ab221e687d7050a8dbfcb1d..e5530fae6937b077d84557a0be7d4a4006a9d0de 100644 (file)
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -85,8 +85,7 @@ static inline MagickBooleanType IsCMYKColorspace(
 static inline MagickBooleanType IsGrayColorspace(
   const ColorspaceType colorspace)
 {
-  if ((colorspace == GRAYColorspace) || (colorspace == Rec601LumaColorspace) ||
-      (colorspace == Rec709LumaColorspace))
+  if (colorspace == GRAYColorspace)
     return(MagickTrue);
   return(MagickFalse);
 }

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 4aa5996b8042c9de4f9bc22e364f273f3ac7c030..2765a8f19447c7a16dc28882d02a8118eb3e772f 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1262,30 +1262,6 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       }
       break;
     }
-    case Rec601LumaColorspace:
-    {
-      /*
-        Initialize Rec601 luma tables:
-
-          G = 0.298839*R+0.586811*G+0.114350*B
-      */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4)
-#endif
-      for (i=0; i <= (ssize_t) MaxMap; i++)
-      {
-        x_map[i].x=(MagickRealType) (0.298839f*(float) i);
-        y_map[i].x=(MagickRealType) (0.586811f*(float) i);
-        z_map[i].x=(MagickRealType) (0.114350f*(float) i);
-        x_map[i].y=(MagickRealType) (0.298839f*(float) i);
-        y_map[i].y=(MagickRealType) (0.586811f*(float) i);
-        z_map[i].y=(MagickRealType) (0.114350f*(float) i);
-        x_map[i].z=(MagickRealType) (0.298839f*(float) i);
-        y_map[i].z=(MagickRealType) (0.586811f*(float) i);
-        z_map[i].z=(MagickRealType) (0.114350f*(float) i);
-      }
-      break;
-    }
     case Rec601YCbCrColorspace:
     case YCbCrColorspace:
     {
@@ -1319,30 +1295,6 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       }
       break;
     }
-    case Rec709LumaColorspace:
-    {
-      /*
-        Initialize Rec709 luma tables:
-
-          G = 0.21260*R+0.71520*G+0.07220*B
-      */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4)
-#endif
-      for (i=0; i <= (ssize_t) MaxMap; i++)
-      {
-        x_map[i].x=(MagickRealType) (0.21260f*(float) i);
-        y_map[i].x=(MagickRealType) (0.71520f*(float) i);
-        z_map[i].x=(MagickRealType) (0.07220f*(float) i);
-        x_map[i].y=(MagickRealType) (0.21260f*(float) i);
-        y_map[i].y=(MagickRealType) (0.71520f*(float) i);
-        z_map[i].y=(MagickRealType) (0.07220f*(float) i);
-        x_map[i].z=(MagickRealType) (0.21260f*(float) i);
-        y_map[i].z=(MagickRealType) (0.71520f*(float) i);
-        z_map[i].z=(MagickRealType) (0.07220f*(float) i);
-      }
-      break;
-    }
     case Rec709YCbCrColorspace:
     {
       /*
@@ -2319,8 +2271,6 @@ static MagickBooleanType TransformsRGBImage(Image *image,
       return(status);
     }
     case GRAYColorspace:
-    case Rec601LumaColorspace:
-    case Rec709LumaColorspace:
     {
       /*
         Transform linear GRAY to sRGB colorspace.

diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index 38768c4dce83ff1705d2bb9cd53287fd3d8f3324..fc7e9a83971f2b4e0f8d6ed15ba945ab33ebba2d 100644 (file)
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -38,9 +38,7 @@ typedef enum
   LMSColorspace,
   LuvColorspace,
   OHTAColorspace,
-  Rec601LumaColorspace,
   Rec601YCbCrColorspace,
-  Rec709LumaColorspace,
   Rec709YCbCrColorspace,
   RGBColorspace,
   sRGBColorspace,

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 2b69a51611490fdeb72e2319b2c42b2b50957b95..d0fe05750578f20163f5c437041ffa43c3ee6956 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -889,9 +889,7 @@ static const OptionInfo
     { "Log", LogColorspace, UndefinedOptionFlag, MagickFalse },
     { "Luv", LuvColorspace, UndefinedOptionFlag, MagickFalse },
     { "OHTA", OHTAColorspace, UndefinedOptionFlag, MagickFalse },
-    { "Rec601Luma", Rec601LumaColorspace, UndefinedOptionFlag, MagickFalse },
     { "Rec601YCbCr", Rec601YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
-    { "Rec709Luma", Rec709LumaColorspace, UndefinedOptionFlag, MagickFalse },
     { "Rec709YCbCr", Rec709YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
     { "RGB", RGBColorspace, UndefinedOptionFlag, MagickFalse },
     { "sRGB", sRGBColorspace, UndefinedOptionFlag, MagickFalse },

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 6f818e9d91b803892af87a811b3696dde0ecf6d5..96f1bce4f4e68ef8e9df073f42b780d55bfe0c02 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2107,8 +2107,6 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
       break;
     }
     case GRAYColorspace:
-    case Rec601LumaColorspace:
-    case Rec709LumaColorspace:
     {
       jpeg_info.input_components=1;
       jpeg_info.in_color_space=JCS_GRAYSCALE;
@@ -2493,8 +2491,6 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
           break;
         }
         case GRAYColorspace:
-        case Rec601LumaColorspace:
-        case Rec709LumaColorspace:
         {
           (void) LogMagickEvent(CoderEvent,GetMagickModule(),
             "Colorspace: GRAY");