]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 19 Jun 2012 15:23:24 +0000 (15:23 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 19 Jun 2012 15:23:24 +0000 (15:23 +0000)
26 files changed:
MagickCore/colorspace.c
MagickCore/decorate.c
MagickCore/display.c
MagickCore/enhance.c
MagickCore/fx.c
MagickCore/image.h
MagickCore/magick-type.h
MagickCore/pixel-accessor.h
MagickCore/quantize.c
MagickCore/quantum-import.c
MagickCore/quantum-private.h
MagickCore/quantum.h
MagickCore/version.h
MagickCore/xwindow.c
coders/cut.c
coders/fax.c
coders/histogram.c
coders/mono.c
coders/otb.c
coders/pcx.c
coders/ps2.c
coders/sgi.c
coders/uil.c
coders/xbm.c
config/ImageMagick.rdf
config/configure.xml

index 6b5c8034281eb4a63366b05b343f6d9c85b7cf50..63d3f3593e913802a6bbb12ce5883fe3772fad5f 100644 (file)
@@ -773,9 +773,12 @@ static MagickBooleanType sRGBTransformImage(Image *image,
           red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
           green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
           blue=QuantumRange*DecompandsRGB(QuantumScale*GetPixelBlue(image,q));
-          SetPixelRed(image,logmap[ScaleQuantumToMap(red)],q);
-          SetPixelGreen(image,logmap[ScaleQuantumToMap(green)],q);
-          SetPixelBlue(image,logmap[ScaleQuantumToMap(blue)],q);
+          SetPixelRed(image,logmap[ScaleQuantumToMap(
+            ClampToQuantum(red))],q);
+          SetPixelGreen(image,logmap[ScaleQuantumToMap(
+            ClampToQuantum(green))],q);
+          SetPixelBlue(image,logmap[ScaleQuantumToMap(
+            ClampToQuantum(blue))],q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2379,7 +2382,7 @@ static MagickBooleanType TransformsRGBImage(Image *image,
           (pow(10.0,(1024.0*i/MaxMap-reference_white)*
           (gamma/density)*0.002/film_gamma)-black));
       for ( ; i <= (ssize_t) MaxMap; i++)
-        logmap[i]=(Quantum) QuantumRange;
+        logmap[i]=QuantumRange;
       if (image->storage_class == PseudoClass)
         {
           if (SyncImage(image,exception) == MagickFalse)
index b6c83e2c1d880058a2f934a282a2044bb31c796c..0d18abd6766c4be5592a4573ee203079bdac0136 100644 (file)
@@ -673,12 +673,12 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       (image->rows <= (raise_info->height << 1)))
     ThrowBinaryException(OptionError,"ImageSizeMustExceedBevelWidth",
       image->filename);
-  foreground=(Quantum) QuantumRange;
+  foreground=QuantumRange;
   background=(Quantum) 0;
   if (raise == MagickFalse)
     {
       foreground=(Quantum) 0;
-      background=(Quantum) QuantumRange;
+      background=QuantumRange;
     }
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
index 5c5d450ff489ea75c12e727b6db190ba4166774b..5f69efba713da8e5b638fe9919f033f6c750a143 100644 (file)
@@ -4330,8 +4330,8 @@ static MagickBooleanType XCompositeImage(Display *display,
         Create mattes for blending.
       */
       (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,exception);
-      opacity=(Quantum) (ScaleQuantumToChar((Quantum) QuantumRange)-
-        ((ssize_t) ScaleQuantumToChar((Quantum) QuantumRange)*blend)/100);
+      opacity=(Quantum) (ScaleQuantumToChar(QuantumRange)-
+        ((ssize_t) ScaleQuantumToChar(QuantumRange)*blend)/100);
       if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
         return(MagickFalse);
       image->matte=MagickTrue;
index 6bd8fedf4cf44ba4ea7bccf9d4e0c6702dc1b6c1..9710b529c61edc56b6b3123ebfb592c567970799 100644 (file)
@@ -3085,13 +3085,13 @@ MagickExport MagickBooleanType NegateImage(Image *image,
               (image->colormap[i].green != image->colormap[i].blue))
             continue;
         if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].red=(Quantum) QuantumRange-
+          image->colormap[i].red=QuantumRange-
             image->colormap[i].red;
         if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].green=(Quantum) QuantumRange-
+          image->colormap[i].green=QuantumRange-
             image->colormap[i].green;
         if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].blue=(Quantum) QuantumRange-
+          image->colormap[i].blue=QuantumRange-
             image->colormap[i].blue;
       }
     }
index fda15d7a85226a206c9befad2bfb102acee35e10..68b09427f24cebd6e53a9f125137dbe8a301f5d2 100644 (file)
@@ -4597,12 +4597,12 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
       for (i=0; i < (ssize_t) image->colors; i++)
       {
         if ((MagickRealType) image->colormap[i].red > threshold)
-          image->colormap[i].red=(Quantum) QuantumRange-image->colormap[i].red;
+          image->colormap[i].red=QuantumRange-image->colormap[i].red;
         if ((MagickRealType) image->colormap[i].green > threshold)
-          image->colormap[i].green=(Quantum) QuantumRange-
+          image->colormap[i].green=QuantumRange-
             image->colormap[i].green;
         if ((MagickRealType) image->colormap[i].blue > threshold)
-          image->colormap[i].blue=(Quantum) QuantumRange-
+          image->colormap[i].blue=QuantumRange-
             image->colormap[i].blue;
       }
     }
index e9ffa761c69361d5a98fceb00ee9f055190ca2e6..ebac6cb25dda566071501e1ac3b98645a4ad0630 100644 (file)
@@ -24,7 +24,7 @@ extern "C" {
 
 #include <MagickCore/color.h>
 
-#define OpaqueAlpha  ((Quantum) QuantumRange)
+#define OpaqueAlpha  (QuantumRange)
 #define TransparentAlpha  ((Quantum) 0UL)
 
 typedef enum
index 799ec351d744b787896545c29c10a0fd2f8128ba..21d5d7ce54cdd35787530fdbb2aa335ee37c7938 100644 (file)
@@ -52,7 +52,7 @@ typedef float Quantum;
 #define QuantumFormat  "%g"
 #else
 typedef unsigned char Quantum;
-#define QuantumRange  255
+#define QuantumRange  ((Quantum) 255)
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 16)
@@ -71,7 +71,7 @@ typedef float Quantum;
 #define QuantumFormat  "%g"
 #else
 typedef unsigned short Quantum;
-#define QuantumRange  65535
+#define QuantumRange  ((Quantum) 65535)
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 32)
@@ -86,7 +86,7 @@ typedef float Quantum;
 #define QuantumFormat  "%g"
 #else
 typedef unsigned int Quantum;
-#define QuantumRange  4294967295
+#define QuantumRange  ((Quantum) 4294967295)
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER)
index 491a70f16589c4935f9ad236ff462782c6eb9763..78bf4711543c7ccb2ba1f5727bcd4f5c87dcfd7a 100644 (file)
@@ -484,7 +484,7 @@ static inline MagickBooleanType IsPixelMonochrome(const Image *restrict image,
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   if (((pixel[image->channel_map[RedPixelChannel].offset] == 0) ||
-      (pixel[image->channel_map[RedPixelChannel].offset] == (Quantum) QuantumRange)) &&
+      (pixel[image->channel_map[RedPixelChannel].offset] == QuantumRange)) &&
       (pixel[image->channel_map[RedPixelChannel].offset] ==
        pixel[image->channel_map[GreenPixelChannel].offset]) &&
       (pixel[image->channel_map[GreenPixelChannel].offset] ==
@@ -538,7 +538,7 @@ static inline MagickBooleanType IsPixelInfoMonochrome(
   const PixelInfo *restrict pixel_info)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if (((pixel_info->red == 0) || (pixel_info->red == (Quantum) QuantumRange)) &&
+  if (((pixel_info->red == 0) || (pixel_info->red == QuantumRange)) &&
       (pixel_info->red == pixel_info->green) &&
       (pixel_info->green == pixel_info->blue))
     return(MagickTrue);
index 7cb944e5a0aa756c9406685506f26a45943c47ec..5a6a9dc90e7da0ae718b6d10937c595c678539f0 100644 (file)
@@ -482,7 +482,7 @@ static inline Quantum ClampToUnsignedQuantum(const MagickRealType value)
   if (value <= 0.0)
     return((Quantum) 0);
   if (value >= QuantumRange)
-    return((Quantum) QuantumRange);
+    return(QuantumRange);
   return((Quantum) (value+0.5));
 }
 
index 37f649ba62050c39b885f1a564272fd891f3ca5e..31bf535c7243794c66e20b07f2db495cf57274d1 100644 (file)
@@ -1605,10 +1605,10 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info,
         white;
 
       black=0;
-      white=(Quantum) QuantumRange;
+      white=QuantumRange;
       if (quantum_info->min_is_white != MagickFalse)
         {
-          black=(Quantum) QuantumRange;
+          black=QuantumRange;
           white=0;
         }
       for (x=0; x < ((ssize_t) number_pixels-7); x+=8)
index 5bf5a1adc9bcaf06581c6cc2ccee583b5b2b61fb..bf94a150409032b54a498bf196338d9660c1320d 100644 (file)
@@ -316,7 +316,7 @@ static inline Quantum ScaleMapToQuantum(const MagickRealType value)
   if (value <= 0.0)
     return((Quantum) 0);
   if (value >= MaxMap)
-    return((Quantum) QuantumRange);
+    return(QuantumRange);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (value+0.5));
 #else
@@ -419,7 +419,7 @@ static inline Quantum ScaleMapToQuantum(const MagickRealType value)
   if (value <= 0.0)
     return((Quantum) 0);
   if (value >= MaxMap)
-    return((Quantum) QuantumRange);
+    return(QuantumRange);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (value+0.5));
 #else
index da20ae92d6001572741d58a940a48bd34ff86a79..ce4a0809946eca616a313dc6439ad59b6acc8924 100644 (file)
@@ -90,7 +90,7 @@ static inline Quantum ClampToQuantum(const double value)
   if (value <= 0.0)
     return((Quantum) 0);
   if (value >= (double) QuantumRange)
-    return((Quantum) QuantumRange);
+    return(QuantumRange);
   return((Quantum) (value+0.5));
 #endif
 }
index 31c70eeb987fbedcd611bb8facd10be8ebe1f7e6..5d68968ceadfb497b4cbb8d885bb25a3a34491c2 100644 (file)
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-06-17"
+#define MagickReleaseDate  "2012-06-19"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
index 828a74d4b10025eec640b29406fa1a5aa4b8fb8a..b340c233a0827edd7e3303589e890e438542af19 100644 (file)
@@ -5974,7 +5974,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
         (XPixelIntensity(&window->pixel_info->background_color) <
          XPixelIntensity(&window->pixel_info->foreground_color) ? 0x80 : 0x00);
       polarity=(unsigned short) ((GetPixelInfoIntensity(
-        &canvas->colormap[0])) < ((Quantum) QuantumRange/2) ? 1 : 0);
+        &canvas->colormap[0])) < (QuantumRange/2) ? 1 : 0);
       if (canvas->colors == 2)
         polarity=GetPixelInfoIntensity(&canvas->colormap[0]) <
           GetPixelInfoIntensity(&canvas->colormap[1]);
@@ -6606,7 +6606,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
         (XPixelIntensity(&window->pixel_info->background_color) <
          XPixelIntensity(&window->pixel_info->foreground_color) ?  0x01 : 0x00);
       polarity=(unsigned short) ((GetPixelInfoIntensity(
-        &canvas->colormap[0])) < ((Quantum) QuantumRange/2) ? 1 : 0);
+        &canvas->colormap[0])) < (QuantumRange/2) ? 1 : 0);
       if (canvas->colors == 2)
         polarity=GetPixelInfoIntensity(&canvas->colormap[0]) <
           GetPixelInfoIntensity(&canvas->colormap[1]);
index cf184f1daab59d93fb66f280a58543e21534f5b9..d09af03aa5477092289134202cdd7795c3aa0e8c 100644 (file)
@@ -572,7 +572,7 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 }
 
               image->colormap[1].red=image->colormap[1].green=
-                image->colormap[1].blue=(Quantum) QuantumRange;
+                image->colormap[1].blue=QuantumRange;
               for (i=0; i < (ssize_t)image->rows; i++)
                 {
                   q=QueueAuthenticPixels(image,0,i,image->columns,1,exception);
index 665b2e4ef14d93d70bd7e6e5f407fdb2e84a9527..2445c2a3518c444a2538c8508dbb9ea0686c04ed 100644 (file)
@@ -167,9 +167,9 @@ static Image *ReadFAXImage(const ImageInfo *image_info,ExceptionInfo *exception)
   /*
     Monochrome colormap.
   */
-  image->colormap[0].red=(Quantum) QuantumRange;
-  image->colormap[0].green=(Quantum) QuantumRange;
-  image->colormap[0].blue=(Quantum) QuantumRange;
+  image->colormap[0].red=QuantumRange;
+  image->colormap[0].green=QuantumRange;
+  image->colormap[0].blue=QuantumRange;
   image->colormap[1].red=(Quantum) 0;
   image->colormap[1].green=(Quantum) 0;
   image->colormap[1].blue=(Quantum) 0;
index 86a8aa97f6356e9f4f69bf25c1e52aa4b6ad9832..90f0b1cbd87a9933d3a2b6e9e9c6c07f32293128 100644 (file)
@@ -244,7 +244,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   /*
     Allocate histogram count arrays.
   */
-  length=MagickMax((size_t) ScaleQuantumToChar((Quantum) QuantumRange)+1UL,
+  length=MagickMax((size_t) ScaleQuantumToChar(QuantumRange)+1UL,
     histogram_image->columns);
   histogram=(PixelInfo *) AcquireQuantumMemory(length,
     sizeof(*histogram));
index 27955aa1f2ffe66c3250c960d820ba64490842ad..45659054c6de939a28b64f949b1efaf16be5f1ec 100644 (file)
@@ -333,11 +333,11 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info,
       byte>>=1;
       if (image->endian == LSBEndian)
         {
-          if (GetPixelIntensity(image,p) < ((Quantum) QuantumRange/2.0))
+          if (GetPixelIntensity(image,p) < (QuantumRange/2.0))
             byte|=0x80;
         }
       else
-        if (GetPixelIntensity(image,p) >= ((Quantum) QuantumRange/2.0))
+        if (GetPixelIntensity(image,p) >= (QuantumRange/2.0))
           byte|=0x80;
       bit++;
       if (bit == 8)
index b8828bc9f26dd30f02b4941e89371b3ea784aed4..b580d1e4121c4f81ef825125117449a942a2093d 100644 (file)
@@ -365,7 +365,7 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image,
     byte=0;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (GetPixelIntensity(image,p) < ((Quantum) QuantumRange/2.0))
+      if (GetPixelIntensity(image,p) < (QuantumRange/2.0))
         byte|=0x1 << (7-bit);
       bit++;
       if (bit == 8)
index bc0233acbada9cca8c23121e01926306a771e923..e6eadb6034355cca770b56b672299fbeba5216d7 100644 (file)
@@ -449,9 +449,9 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
               image->colormap[0].red=(Quantum) 0;
               image->colormap[0].green=(Quantum) 0;
               image->colormap[0].blue=(Quantum) 0;
-              image->colormap[1].red=(Quantum) QuantumRange;
-              image->colormap[1].green=(Quantum) QuantumRange;
-              image->colormap[1].blue=(Quantum) QuantumRange;
+              image->colormap[1].red=QuantumRange;
+              image->colormap[1].green=QuantumRange;
+              image->colormap[1].blue=QuantumRange;
             }
           else
             if (image->colors > 16)
@@ -1096,7 +1096,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image,
               Convert PseudoClass image to a PCX monochrome image.
             */
             polarity=(Quantum) (GetPixelInfoIntensity(
-              &image->colormap[0]) < ((Quantum) QuantumRange/2) ? 1 : 0);
+              &image->colormap[0]) < (QuantumRange/2) ? 1 : 0);
             if (image->colors == 2)
               polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) <
                 GetPixelInfoIntensity(&image->colormap[1]) ? 1 : 0);
index 862aae2fa77ed0049b45f245006741859a4122b5..ea668f4dee743cca8472e267d380d75f1b2e6bae 100644 (file)
@@ -891,9 +891,9 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image,
                   if ((image->matte != MagickFalse) &&
                       (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha))
                     {
-                      *q++=ScaleQuantumToChar((Quantum) QuantumRange);
-                      *q++=ScaleQuantumToChar((Quantum) QuantumRange);
-                      *q++=ScaleQuantumToChar((Quantum) QuantumRange);
+                      *q++=ScaleQuantumToChar(QuantumRange);
+                      *q++=ScaleQuantumToChar(QuantumRange);
+                      *q++=ScaleQuantumToChar(QuantumRange);
                     }
                   else
                     if (image->colorspace != CMYKColorspace)
index 15f346a84015e018dee7c7e3e8d7e4a750c7df3f..ad6f9a4f490765f2f20b0f012fa2ececf77257c6 100644 (file)
@@ -939,8 +939,8 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image,
       }
     iris_info.minimum_value=0;
     iris_info.maximum_value=(size_t) (image->depth <= 8 ?
-      1UL*ScaleQuantumToChar((Quantum) QuantumRange) :
-      1UL*ScaleQuantumToShort((Quantum) QuantumRange));
+      1UL*ScaleQuantumToChar(QuantumRange) :
+      1UL*ScaleQuantumToShort(QuantumRange));
     /*
       Write SGI header.
     */
index 23f4b5da6b88f379467afe3239240c9939484f43..94ecab491d52ac4ebe41a6dab3002c02430ab30f 100644 (file)
@@ -330,7 +330,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
       (void) FormatLocaleString(buffer,MaxTextExtent,
         "    color('%s',%s) = '%s'",name,
         GetPixelInfoIntensity(image->colormap+i) <
-        ((Quantum) QuantumRange/2) ? "background" : "foreground",symbol);
+        (QuantumRange/2) ? "background" : "foreground",symbol);
     (void) WriteBlobString(image,buffer);
     (void) FormatLocaleString(buffer,MaxTextExtent,"%s",
       (i == (ssize_t) (colors-1) ? ");\n" : ",\n"));
index 2d8d92a59ed2510f06f4e19b98fe540541eb16a8..d6b3638c115b18f05e0a984d8ded2bca54303939 100644 (file)
@@ -277,9 +277,9 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
   /*
     Initialize colormap.
   */
-  image->colormap[0].red=(Quantum) QuantumRange;
-  image->colormap[0].green=(Quantum) QuantumRange;
-  image->colormap[0].blue=(Quantum) QuantumRange;
+  image->colormap[0].red=QuantumRange;
+  image->colormap[0].green=QuantumRange;
+  image->colormap[0].blue=QuantumRange;
   image->colormap[1].red=(Quantum) 0;
   image->colormap[1].green=(Quantum) 0;
   image->colormap[1].blue=(Quantum) 0;
index 316c0f910b5634d3431f89516e52b6916b3a2102..551c70150be452e7c7279db9530c13a0c8523b08 100644 (file)
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-06-17</created>
+    <created>2012-06-19</created>
 
     <description xml:lang="en">
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-06-17</created>
+          <created>2012-06-19</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>
index 9a7e3c6d393dcb04864452bf2e97eb95fb7e2fbd..855cf7fab32a1ae6bab0cf98ba1b8e0ef70a28a6 100644 (file)
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="8297" />
-  <configure name="RELEASE_DATE" value="2012-06-17"/>
+  <configure name="RELEASE_DATE" value="2012-06-19"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>