(no commit message)

diff --git a/MagickCore/option.c b/MagickCore/option.c
index ac9457278dfb1987fe6902b151c4f3de910bdeb6..0e4e8c32e3c463f61d6f516161a4fb08ab4a19e1 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -63,6 +63,7 @@
 #include "MagickCore/montage.h"
 #include "MagickCore/morphology.h"
 #include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/property.h"
 #include "MagickCore/quantize.h"
@@ -1259,6 +1260,7 @@ static const OptionInfo
     { "Noise", MagickNoiseOptions, UndefinedOptionFlag, MagickFalse },
     { "Orientation", MagickOrientationOptions, UndefinedOptionFlag, MagickFalse },
     { "PixelChannel", MagickPixelChannelOptions, UndefinedOptionFlag, MagickFalse },
+    { "PixelIntensity", MagickPixelIntensityOptions, UndefinedOptionFlag, MagickFalse },
     { "PixelTrait", MagickPixelTraitOptions, UndefinedOptionFlag, MagickFalse },
     { "Policy", MagickPolicyOptions, UndefinedOptionFlag, MagickFalse },
     { "PolicyDomain", MagickPolicyDomainOptions, UndefinedOptionFlag, MagickFalse },
@@ -1426,6 +1428,17 @@ static const OptionInfo
     { "Yellow", YellowPixelChannel, UndefinedOptionFlag, MagickFalse },
     { (char *) NULL, UndefinedPixelChannel, UndefinedOptionFlag, MagickFalse }
   },
+  PixelIntensityOptions[] =
+  {
+    { "Undefined", UndefinedPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "Average", AveragePixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "Brightness", BrightnessPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "Lightness", LightnessPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "Rec601Luma", Rec601LumaPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "Rec709Luma", Rec709LumaPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "RMS", RMSPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { (char *) NULL, UndefinedPixelIntensityMethod, UndefinedOptionFlag, MagickFalse }
+  },
   PixelTraitOptions[] =
   {
     { "Undefined", UndefinedPixelTrait, UndefinedOptionFlag, MagickTrue },
@@ -1699,6 +1712,7 @@ static const OptionInfo *GetOptionInfo(const CommandOption option)
     case MagickNoiseOptions: return(NoiseOptions);
     case MagickOrientationOptions: return(OrientationOptions);
     case MagickPixelChannelOptions: return(PixelChannelOptions);
+    case MagickPixelIntensityOptions: return(PixelIntensityOptions);
     case MagickPixelTraitOptions: return(PixelTraitOptions);
     case MagickPolicyDomainOptions: return(PolicyDomainOptions);
     case MagickPolicyRightsOptions: return(PolicyRightsOptions);

diff --git a/MagickCore/option.h b/MagickCore/option.h
index e534dcb4c4ecbe6ed4586268cb8b24885e7bddd0..53a3995317865fbb4bf1f72efd13432e1052cd8e 100644 (file)
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -77,6 +77,7 @@ typedef enum
   MagickNoiseOptions,
   MagickOrientationOptions,
   MagickPixelChannelOptions,
+  MagickPixelIntensityOptions,
   MagickPixelTraitOptions,
   MagickPolicyOptions,
   MagickPolicyDomainOptions,

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 6c4918f66a7df41f38bf1918862d06425199d12c..966d8dd56fd70d6980557b9860740a037dbb3271 100644 (file)
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -58,23 +58,6 @@ typedef enum
   DefaultChannels = ((AllChannels | SyncChannels) &~ AlphaChannel)
 } ChannelType;  /* must correspond to PixelChannel */
 
-typedef enum
-{
-  UndefinedInterpolatePixel,
-  AverageInterpolatePixel,    /* Average 4 nearest neighbours */
-  Average9InterpolatePixel,   /* Average 9 nearest neighbours */
-  Average16InterpolatePixel,  /* Average 16 nearest neighbours */
-  BackgroundInterpolatePixel, /* Just return background color */
-  BilinearInterpolatePixel,   /* Triangular filter interpolation */
-  BlendInterpolatePixel,      /* blend of nearest 1, 2 or 4 pixels */
-  CatromInterpolatePixel,     /* Catmull-Rom interpolation */
-  IntegerInterpolatePixel,    /* Integer (floor) interpolation */
-  MeshInterpolatePixel,       /* Triangular Mesh interpolation */
-  NearestInterpolatePixel,    /* Nearest Neighbour Only */
-  SplineInterpolatePixel     /* Cubic Spline (blurred) interpolation */
-  /* FilterInterpolatePixel,  ** Use resize filter - (very slow) */
-} PixelInterpolateMethod;
-
 typedef enum
 {
   UndefinedPixelChannel = 0,
@@ -101,6 +84,34 @@ typedef enum
   SyncPixelChannel = MaxPixelChannels+1
 } PixelChannel;  /* must correspond to ChannelType */
 
+typedef enum
+{
+  UndefinedPixelIntensityMethod = 0,
+  AveragePixelIntensityMethod,
+  BrightnessPixelIntensityMethod,
+  LightnessPixelIntensityMethod,
+  Rec601LumaPixelIntensityMethod,
+  Rec709LumaPixelIntensityMethod,
+  RMSPixelIntensityMethod
+} PixelIntensityMethod;
+
+typedef enum
+{
+  UndefinedInterpolatePixel,
+  AverageInterpolatePixel,    /* Average 4 nearest neighbours */
+  Average9InterpolatePixel,   /* Average 9 nearest neighbours */
+  Average16InterpolatePixel,  /* Average 16 nearest neighbours */
+  BackgroundInterpolatePixel, /* Just return background color */
+  BilinearInterpolatePixel,   /* Triangular filter interpolation */
+  BlendInterpolatePixel,      /* blend of nearest 1, 2 or 4 pixels */
+  CatromInterpolatePixel,     /* Catmull-Rom interpolation */
+  IntegerInterpolatePixel,    /* Integer (floor) interpolation */
+  MeshInterpolatePixel,       /* Triangular Mesh interpolation */
+  NearestInterpolatePixel,    /* Nearest Neighbour Only */
+  SplineInterpolatePixel     /* Cubic Spline (blurred) interpolation */
+  /* FilterInterpolatePixel,  ** Use resize filter - (very slow) */
+} PixelInterpolateMethod;
+
 typedef enum
 {
   UndefinedPixelTrait = 0x000000,