Include declarations.
*/
#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
#include "MagickCore/blob.h"
#include "MagickCore/blob-private.h"
#include "MagickCore/cache.h"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% FindColor() returns the index of the matching entry from PalmPalette for a
-% given PixelPacket.
+% given PixelInfo.
%
% The format of the FindColor method is:
%
-% int FindColor(const Image *image,PixelPacket *pixel)
+% int FindColor(const Image *image,PixelInfo *pixel)
%
% A description of each parameter follows:
%
% o int: the index of the matching color or -1 if not found/
%
-% o pixel: a pointer to the PixelPacket to be matched.
+% o pixel: a pointer to the PixelInfo to be matched.
%
*/
-static int FindColor(const Image *image,PixelPacket *packet)
+static int FindColor(const Image *image,PixelInfo *packet)
{
register ssize_t
i;
for (i=0; i < (ssize_t) count; i++)
{
ReadBlobByte(image);
- index=ConstrainColormapIndex(image,255-i);
+ index=ConstrainColormapIndex(image,255-i,exception);
image->colormap[(int) index].red=
ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
image->colormap[(int) index].green=
{
for (i=0; i < (ssize_t) (1L << bits_per_pixel); i++)
{
- index=ConstrainColormapIndex(image,255-i);
+ index=ConstrainColormapIndex(image,255-i,exception);
image->colormap[(int) index].red=
ScaleCharToQuantum(PalmPalette[i][0]);
image->colormap[(int) index].green=
ThrowReaderException(CorruptImageError,"CorruptImage");
index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit));
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
if (bit)
bit-=bits_per_pixel;
else
if (flags & PALM_HAS_TRANSPARENCY_FLAG)
{
if (bits_per_pixel != 16)
- SetPixelInfoPacket(image,image->colormap+(mask-transparentIndex),
- &transpix);
+ transpix=image->colormap[mask-transparentIndex];
(void) TransparentPaintImage(image,&transpix,(Quantum) TransparentAlpha,
MagickFalse,exception);
}
MagickSizeType
cc;
- PixelPacket
+ PixelInfo
transpix;
QuantizeInfo
scene=0;
do
{
- if (IsRGBColorspace(image->colorspace) == MagickFalse)
- (void) TransformImageColorspace(image,RGBColorspace);
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
count=GetNumberColors(image,NULL,exception);
for (bits_per_pixel=1; (one << bits_per_pixel) < count; bits_per_pixel*=2) ;
if (image_info->depth > 100)
bits_per_pixel=image_info->depth-100;
if (bits_per_pixel < 16)
- (void) TransformImageColorspace(image,image->colorspace);
+ (void) TransformImageColorspace(image,image->colorspace,exception);
if (bits_per_pixel < 8)
{
- (void) TransformImageColorspace(image,GRAYColorspace);
+ (void) TransformImageColorspace(image,GRAYColorspace,exception);
(void) SetImageType(image,PaletteType,exception);
(void) SortColormapByIntensity(image,exception);
}
{
if (flags & PALM_HAS_COLORMAP_FLAG) /* Write out colormap */
{
- quantize_info->dither=IsPaletteImage(image,exception);
+ quantize_info->dither_method=IsPaletteImage(image,exception)
+ == MagickFalse ? RiemersmaDitherMethod : NoDitherMethod;
quantize_info->number_colors=image->colors;
(void) QuantizeImage(quantize_info,image,exception);
(void) WriteBlobMSBShort(image,(unsigned short) image->colors);
affinity_image=ConstituteImage(256,1,"RGB",CharPixel,&PalmPalette,
exception);
(void) TransformImageColorspace(affinity_image,
- affinity_image->colorspace);
+ affinity_image->colorspace,exception);
(void) RemapImage(quantize_info,image,affinity_image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{