From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 1 Oct 2011 23:18:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6920
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3094b7f3243820cc5559d370412a9d406d074348;p=imagemagick

---

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index c382d45b6..a30862dac 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -301,7 +301,7 @@ Magick::ColorHSL::ColorHSL ( double hue_,
 			     double luminosity_ )
   : Color ()
 {
-  Quantum red, green, blue;
+  double red, green, blue;
 
   ConvertHSLToRGB ( hue_,
 		 saturation_,
@@ -346,7 +346,7 @@ void Magick::ColorHSL::hue ( double hue_ )
 
   hue_val = hue_;
 
-  Quantum red, green, blue;
+  double red, green, blue;
   ConvertHSLToRGB ( hue_val,
 		 saturation_val,
 		 luminosity_val,
@@ -384,7 +384,7 @@ void Magick::ColorHSL::saturation ( double saturation_ )
   
   saturation_val = saturation_;
   
-  Quantum red, green, blue;
+  double red, green, blue;
   ConvertHSLToRGB ( hue_val,
 		 saturation_val,
 		 luminosity_val,
@@ -422,7 +422,7 @@ void Magick::ColorHSL::luminosity ( double luminosity_ )
   
   luminosity_val = luminosity_;
   
-  Quantum red, green, blue;
+  double red, green, blue;
   ConvertHSLToRGB ( hue_val,
 		 saturation_val,
 		 luminosity_val,
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 438780897..b808a631c 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1818,7 +1818,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          Quantum
+          double
             blue,
             green,
             red;
@@ -1827,9 +1827,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           saturation=(double) (QuantumScale*GetPixelGreen(image,q));
           brightness=(double) (QuantumScale*GetPixelBlue(image,q));
           ConvertHSBToRGB(hue,saturation,brightness,&red,&green,&blue);
-          SetPixelRed(image,red,q);
-          SetPixelGreen(image,green,q);
-          SetPixelBlue(image,blue,q);
+          SetPixelRed(image,ClampToQuantum(red),q);
+          SetPixelGreen(image,ClampToQuantum(green),q);
+          SetPixelBlue(image,ClampToQuantum(blue),q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1884,7 +1884,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          Quantum
+          double
             blue,
             green,
             red;
@@ -1893,9 +1893,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           saturation=(double) (QuantumScale*GetPixelGreen(image,q));
           lightness=(double) (QuantumScale*GetPixelBlue(image,q));
           ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue);
-          SetPixelRed(image,red,q);
-          SetPixelGreen(image,green,q);
-          SetPixelBlue(image,blue,q);
+          SetPixelRed(image,ClampToQuantum(red),q);
+          SetPixelGreen(image,ClampToQuantum(green),q);
+          SetPixelBlue(image,ClampToQuantum(blue),q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1950,7 +1950,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          Quantum
+          double
             blue,
             green,
             red;
@@ -1959,9 +1959,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           whiteness=(double) (QuantumScale*GetPixelGreen(image,q));
           blackness=(double) (QuantumScale*GetPixelBlue(image,q));
           ConvertHWBToRGB(hue,whiteness,blackness,&red,&green,&blue);
-          SetPixelRed(image,red,q);
-          SetPixelGreen(image,green,q);
-          SetPixelBlue(image,blue,q);
+          SetPixelRed(image,ClampToQuantum(red),q);
+          SetPixelGreen(image,ClampToQuantum(green),q);
+          SetPixelBlue(image,ClampToQuantum(blue),q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 741778baf..2ebe94054 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -837,7 +837,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
 %
 */
 
-static void Contrast(const int sign,Quantum *red,Quantum *green,Quantum *blue)
+static void Contrast(const int sign,double *red,double *green,double *blue)
 {
   double
     brightness,
@@ -847,9 +847,9 @@ static void Contrast(const int sign,Quantum *red,Quantum *green,Quantum *blue)
   /*
     Enhance contrast: dark color become darker, light color become lighter.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   hue=0.0;
   saturation=0.0;
   brightness=0.0;
@@ -912,7 +912,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    Quantum
+    double
       blue,
       green,
       red;
@@ -2659,8 +2659,8 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
 */
 
 static void ModulateHSB(const double percent_hue,
-  const double percent_saturation,const double percent_brightness,
-  Quantum *red,Quantum *green,Quantum *blue)
+  const double percent_saturation,const double percent_brightness,double *red,
+  double *green,double *blue)
 {
   double
     brightness,
@@ -2670,9 +2670,9 @@ static void ModulateHSB(const double percent_hue,
   /*
     Increase or decrease color brightness, saturation, or hue.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   ConvertRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness);
   hue+=0.5*(0.01*percent_hue-1.0);
   while (hue < 0.0)
@@ -2685,8 +2685,8 @@ static void ModulateHSB(const double percent_hue,
 }
 
 static void ModulateHSL(const double percent_hue,
-  const double percent_saturation,const double percent_lightness,
-  Quantum *red,Quantum *green,Quantum *blue)
+  const double percent_saturation,const double percent_lightness,double *red,
+  double *green,double *blue)
 {
   double
     hue,
@@ -2696,9 +2696,9 @@ static void ModulateHSL(const double percent_hue,
   /*
     Increase or decrease color lightness, saturation, or hue.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   ConvertRGBToHSL(*red,*green,*blue,&hue,&saturation,&lightness);
   hue+=0.5*(0.01*percent_hue-1.0);
   while (hue < 0.0)
@@ -2710,7 +2710,7 @@ static void ModulateHSL(const double percent_hue,
   ConvertHSLToRGB(hue,saturation,lightness,red,green,blue);
 }
 
-static void ModulateHWB(const double percent_hue,const double percent_whiteness,  const double percent_blackness,Quantum *red,Quantum *green,Quantum *blue)
+static void ModulateHWB(const double percent_hue,const double percent_whiteness,  const double percent_blackness,double *red,double *green,double *blue)
 {
   double
     blackness,
@@ -2720,9 +2720,9 @@ static void ModulateHWB(const double percent_hue,const double percent_whiteness,
   /*
     Increase or decrease color blackness, whiteness, or hue.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   ConvertRGBToHWB(*red,*green,*blue,&hue,&whiteness,&blackness);
   hue+=0.5*(0.01*percent_hue-1.0);
   while (hue < 0.0)
@@ -2839,7 +2839,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    Quantum
+    double
       blue,
       green,
       red;
@@ -2885,9 +2885,9 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate,
           break;
         }
       }
-      SetPixelRed(image,red,q);
-      SetPixelGreen(image,green,q);
-      SetPixelBlue(image,blue,q);
+      SetPixelRed(image,ClampToQuantum(red),q);
+      SetPixelGreen(image,ClampToQuantum(green),q);
+      SetPixelBlue(image,ClampToQuantum(blue),q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h
index bee048662..3125024bc 100644
--- a/MagickCore/gem-private.h
+++ b/MagickCore/gem-private.h
@@ -32,13 +32,13 @@ extern MagickPrivate size_t
   GetOptimalKernelWidth2D(const double,const double);
 
 extern MagickPrivate void
-  ConvertHSBToRGB(const double,const double,const double,Quantum *,Quantum *,
-    Quantum *),
-  ConvertHWBToRGB(const double,const double,const double,Quantum *,Quantum *,
-    Quantum *),
-  ConvertRGBToHSB(const Quantum,const Quantum,const Quantum,double *,double *,
+  ConvertHSBToRGB(const double,const double,const double,double *,double *,
     double *),
-  ConvertRGBToHWB(const Quantum,const Quantum,const Quantum,double *,double *,
+  ConvertHWBToRGB(const double,const double,const double,double *,double *,
+    double *),
+  ConvertRGBToHSB(const double,const double,const double,double *,double *,
+    double *),
+  ConvertRGBToHWB(const double,const double,const double,double *,double *,
     double *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index 3ab4f3f4a..f33a73567 100644
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -74,7 +74,7 @@
 %  The format of the ConvertHSBToRGBImage method is:
 %
 %      void ConvertHSBToRGB(const double hue,const double saturation,
-%        const double brightness,Quantum *red,Quantum *green,Quantum *blue)
+%        const double brightness,double *red,double *green,double *blue)
 %
 %  A description of each parameter follows:
 %
@@ -85,7 +85,7 @@
 %
 */
 MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation,
-  const double brightness,Quantum *red,Quantum *green,Quantum *blue)
+  const double brightness,double *red,double *green,double *blue)
 {
   MagickRealType
     f,
@@ -97,9 +97,9 @@ MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation,
   /*
     Convert HSB to RGB colorspace.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   if (saturation == 0.0)
     {
       *red=ClampToQuantum((MagickRealType) QuantumRange*brightness);
@@ -177,7 +177,7 @@ MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation,
 %  The format of the ConvertHSLToRGBImage method is:
 %
 %      void ConvertHSLToRGB(const double hue,const double saturation,
-%        const double lightness,Quantum *red,Quantum *green,Quantum *blue)
+%        const double lightness,double *red,double *green,double *blue)
 %
 %  A description of each parameter follows:
 %
@@ -205,7 +205,7 @@ static inline MagickRealType ConvertHueToRGB(MagickRealType m1,
 }
 
 MagickExport void ConvertHSLToRGB(const double hue,const double saturation,
-  const double lightness,Quantum *red,Quantum *green,Quantum *blue)
+  const double lightness,double *red,double *green,double *blue)
 {
   MagickRealType
     b,
@@ -217,9 +217,9 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation,
   /*
     Convert HSL to RGB colorspace.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   if (saturation == 0)
     {
       *red=ClampToQuantum((MagickRealType) QuantumRange*lightness);
@@ -257,7 +257,7 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation,
 %  The format of the ConvertHWBToRGBImage method is:
 %
 %      void ConvertHWBToRGB(const double hue,const double whiteness,
-%        const double blackness,Quantum *red,Quantum *green,Quantum *blue)
+%        const double blackness,double *red,double *green,double *blue)
 %
 %  A description of each parameter follows:
 %
@@ -268,7 +268,7 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation,
 %
 */
 MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness,
-  const double blackness,Quantum *red,Quantum *green,Quantum *blue)
+  const double blackness,double *red,double *green,double *blue)
 {
   MagickRealType
     b,
@@ -284,9 +284,9 @@ MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness,
   /*
     Convert HWB to RGB colorspace.
   */
-  assert(red != (Quantum *) NULL);
-  assert(green != (Quantum *) NULL);
-  assert(blue != (Quantum *) NULL);
+  assert(red != (double *) NULL);
+  assert(green != (double *) NULL);
+  assert(blue != (double *) NULL);
   v=1.0-blackness;
   if (hue == 0.0)
     {
@@ -332,8 +332,8 @@ MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness,
 %
 %  The format of the ConvertRGBToHSB method is:
 %
-%      void ConvertRGBToHSB(const Quantum red,const Quantum green,
-%        const Quantum blue,double *hue,double *saturation,double *brightness)
+%      void ConvertRGBToHSB(const double red,const double green,
+%        const double blue,double *hue,double *saturation,double *brightness)
 %
 %  A description of each parameter follows:
 %
@@ -344,8 +344,8 @@ MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness,
 %      component of the HSB color space.
 %
 */
-MagickPrivate void ConvertRGBToHSB(const Quantum red,const Quantum green,
-  const Quantum blue,double *hue,double *saturation,double *brightness)
+MagickPrivate void ConvertRGBToHSB(const double red,const double green,
+  const double blue,double *hue,double *saturation,double *brightness)
 {
   MagickRealType
     delta,
@@ -402,8 +402,8 @@ MagickPrivate void ConvertRGBToHSB(const Quantum red,const Quantum green,
 %
 %  The format of the ConvertRGBToHSL method is:
 %
-%      void ConvertRGBToHSL(const Quantum red,const Quantum green,
-%        const Quantum blue,double *hue,double *saturation,double *lightness)
+%      void ConvertRGBToHSL(const double red,const double green,
+%        const double blue,double *hue,double *saturation,double *lightness)
 %
 %  A description of each parameter follows:
 %
@@ -429,8 +429,8 @@ static inline double MagickMin(const double x,const double y)
   return(y);
 }
 
-MagickExport void ConvertRGBToHSL(const Quantum red,const Quantum green,
-  const Quantum blue,double *hue,double *saturation,double *lightness)
+MagickExport void ConvertRGBToHSL(const double red,const double green,
+  const double blue,double *hue,double *saturation,double *lightness)
 {
   MagickRealType
     b,
@@ -495,8 +495,8 @@ MagickExport void ConvertRGBToHSL(const Quantum red,const Quantum green,
 %
 %  The format of the ConvertRGBToHWB method is:
 %
-%      void ConvertRGBToHWB(const Quantum red,const Quantum green,
-%        const Quantum blue,double *hue,double *whiteness,double *blackness)
+%      void ConvertRGBToHWB(const double red,const double green,
+%        const double blue,double *hue,double *whiteness,double *blackness)
 %
 %  A description of each parameter follows:
 %
@@ -507,8 +507,8 @@ MagickExport void ConvertRGBToHSL(const Quantum red,const Quantum green,
 %      component of the HWB color space.
 %
 */
-MagickPrivate void ConvertRGBToHWB(const Quantum red,const Quantum green,
-  const Quantum blue,double *hue,double *whiteness,double *blackness)
+MagickPrivate void ConvertRGBToHWB(const double red,const double green,
+  const double blue,double *hue,double *whiteness,double *blackness)
 {
   long
     i;
diff --git a/MagickCore/gem.h b/MagickCore/gem.h
index 4519e3e17..3a8dab028 100644
--- a/MagickCore/gem.h
+++ b/MagickCore/gem.h
@@ -29,9 +29,9 @@ extern MagickExport double
   ExpandAffine(const AffineMatrix *);
 
 extern MagickExport void
-  ConvertHSLToRGB(const double,const double,const double,Quantum *,Quantum *,
-    Quantum *),
-  ConvertRGBToHSL(const Quantum,const Quantum,const Quantum,double *,double *,
+  ConvertHSLToRGB(const double,const double,const double,double *,double *,
+    double *),
+  ConvertRGBToHSL(const double,const double,const double,double *,double *,
     double *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h
index 3b4741ca1..5b4512f9b 100644
--- a/MagickCore/pixel-private.h
+++ b/MagickCore/pixel-private.h
@@ -28,21 +28,21 @@ extern "C" {
 #include <magick/image-private.h>
 #include <magick/quantum-private.h>
 
-static inline MagickPixelPacket *CloneMagickPixelPacket(
-  const MagickPixelPacket *pixel)
+static inline MagickPixelInfo *CloneMagickPixelInfo(
+  const MagickPixelInfo *pixel)
 {
-  MagickPixelPacket
+  MagickPixelInfo
     *clone_pixel;
 
-  clone_pixel=(MagickPixelPacket *) AcquireAlignedMemory(1,
+  clone_pixel=(MagickPixelInfo *) AcquireAlignedMemory(1,
     sizeof(*clone_pixel));
-  if (clone_pixel == (MagickPixelPacket *) NULL)
+  if (clone_pixel == (MagickPixelInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   *clone_pixel=(*pixel);
   return(clone_pixel);
 }
 
-static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
+static inline MagickBooleanType IsGrayPixel(const PixelInfo *pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) && 
@@ -63,7 +63,7 @@ static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
   return(MagickFalse);
 }
 
-static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
+static inline MagickBooleanType IsMonochromePixel(const PixelInfo *pixel)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   if (((GetPixelRed(pixel) == 0) ||
@@ -88,8 +88,8 @@ static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
   return(MagickFalse);
 }
 
-static inline void SetMagickPixelPacket(const Image *image,
-  const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
+static inline void SetMagickPixelInfo(const Image *image,
+  const PixelInfo *color,const IndexPacket *index,MagickPixelInfo *pixel)
 {
   pixel->red=(MagickRealType) GetPixelRed(color);
   pixel->green=(MagickRealType) GetPixelGreen(color);
@@ -100,8 +100,8 @@ static inline void SetMagickPixelPacket(const Image *image,
     pixel->index=(MagickRealType) GetPixelIndex(index);
 }
 
-static inline void SetMagickPixelPacketBias(const Image *image,
-  MagickPixelPacket *pixel)
+static inline void SetMagickPixelInfoBias(const Image *image,
+  MagickPixelInfo *pixel)
 {
   /*
     Obsoleted by MorphologyApply().
@@ -113,8 +113,8 @@ static inline void SetMagickPixelPacketBias(const Image *image,
   pixel->index=image->bias;
 }
 
-static inline void SetPixelPacket(const Image *image,
-  const MagickPixelPacket *pixel,PixelPacket *color,IndexPacket *index)
+static inline void SetPixelInfo(const Image *image,
+  const MagickPixelInfo *pixel,PixelInfo *color,IndexPacket *index)
 {
   SetPixelRed(color,ClampToQuantum(pixel->red));
   SetPixelGreen(color,ClampToQuantum(pixel->green));
diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index ea98dbdf9..31a03ccb9 100644
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -105,12 +105,15 @@ typedef struct _PixelInfo
   size_t
     depth;
 
-  MagickRealType
+  MagickSizeType
+    count;
+
+  double
     red,
     green,
     blue,
-    alpha,
     black,
+    alpha,
     index;
 } PixelInfo;
 
@@ -126,16 +129,31 @@ typedef struct _PixelLongPacket
 
 typedef struct _PixelPacket
 {
-  Quantum
+  ClassType
+    storage_class;
+
+  ColorspaceType
+    colorspace;
+
+  MagickBooleanType
+    matte;
+
+  double
+    fuzz;
+
+  size_t
+    depth;
+
+  MagickSizeType
+    count;
+
+  double
     red,
     green,
     blue,
-    alpha,
     black,
+    alpha,
     index;
-
- MagickSizeType
-    count;
 } PixelPacket;
 
 typedef struct _CacheView
diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index 56d0e7137..f16e899e6 100644
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -2029,7 +2029,7 @@ WandExport void PixelSetGreenQuantum(PixelWand *wand,const Quantum green)
 WandExport void PixelSetHSL(PixelWand *wand,const double hue,
   const double saturation,const double lightness)
 {
-  Quantum
+  double
     blue,
     green,
     red;