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);
(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)
(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);
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;
(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;
}
}
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;
}
}
#include <MagickCore/color.h>
-#define OpaqueAlpha ((Quantum) QuantumRange)
+#define OpaqueAlpha (QuantumRange)
#define TransparentAlpha ((Quantum) 0UL)
typedef enum
#define QuantumFormat "%g"
#else
typedef unsigned char Quantum;
-#define QuantumRange 255
+#define QuantumRange ((Quantum) 255)
#define QuantumFormat "%u"
#endif
#elif (MAGICKCORE_QUANTUM_DEPTH == 16)
#define QuantumFormat "%g"
#else
typedef unsigned short Quantum;
-#define QuantumRange 65535
+#define QuantumRange ((Quantum) 65535)
#define QuantumFormat "%u"
#endif
#elif (MAGICKCORE_QUANTUM_DEPTH == 32)
#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)
{
#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] ==
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);
if (value <= 0.0)
return((Quantum) 0);
if (value >= QuantumRange)
- return((Quantum) QuantumRange);
+ return(QuantumRange);
return((Quantum) (value+0.5));
}
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)
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
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
if (value <= 0.0)
return((Quantum) 0);
if (value >= (double) QuantumRange)
- return((Quantum) QuantumRange);
+ return(QuantumRange);
return((Quantum) (value+0.5));
#endif
}
#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)
(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]);
(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]);
}
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);
/*
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;
/*
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));
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)
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)
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)
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);
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)
}
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.
*/
(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"));
/*
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;
<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.
<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>
<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"/>