% July 1992 %
% %
% %
-% Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/nt-feature.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/nt-base-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
\f
/*
Define declarations.
*/
-#if !defined(__WINDOWS__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
#define BI_RGB 0
#define BI_RLE8 1
#define BI_BITFIELDS 3
planes,
bits_per_pixel;
- unsigned long
+ size_t
size,
offset;
} IconEntry;
typedef struct _IconInfo
{
- unsigned long
+ size_t
file_size,
ba_offset,
offset_bits,
size;
- long
+ ssize_t
width,
height;
planes,
bits_per_pixel;
- unsigned long
+ size_t
compression,
image_size,
x_pixels,
alpha_mask,
colors_important;
- long
+ ssize_t
colorspace;
} IconInfo;
\f
Forward declaractions.
*/
static MagickBooleanType
- WriteICONImage(const ImageInfo *,Image *);
+ WriteICONImage(const ImageInfo *,Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Image
*image;
- long
- y;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
- register long
+ register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
*p;
- ssize_t
- count,
- offset;
-
- unsigned long
+ size_t
bit,
- byte;
-
- unsigned long
+ byte,
bytes_per_line,
+ one,
scanline_pad;
+ ssize_t
+ count,
+ offset,
+ y;
+
/*
Open image file.
*/
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s",image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
icon_file.directory[i].size=ReadBlobLSBLong(image);
icon_file.directory[i].offset=ReadBlobLSBLong(image);
}
+ one=1;
for (i=0; i < icon_file.count; i++)
{
/*
if (offset < 0)
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
icon_info.size=ReadBlobLSBLong(image);
- icon_info.width=(unsigned char) ReadBlobLSBLong(image);
- icon_info.height=(unsigned char) ReadBlobLSBLong(image)/2;
- if ((icon_file.directory[i].width == 0) &&
- (icon_file.directory[i].height == 0))
+ icon_info.width=(unsigned char) ((int) ReadBlobLSBLong(image));
+ icon_info.height=(unsigned char) ((int) ReadBlobLSBLong(image)/2);
+ icon_info.planes=ReadBlobLSBShort(image);
+ icon_info.bits_per_pixel=ReadBlobLSBShort(image);
+ if ((icon_info.planes == 18505) && (icon_info.bits_per_pixel == 21060))
{
Image
*icon_image;
Icon image encoded as a compressed PNG image.
*/
length=icon_file.directory[i].size;
- png=(unsigned char *) AcquireQuantumMemory(length+12,sizeof(*png));
+ png=(unsigned char *) AcquireQuantumMemory(length+16,sizeof(*png));
if (png == (unsigned char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
(void) CopyMagickMemory(png,"\211PNG\r\n\032\n\000\000\000\015",12);
- count=ReadBlob(image,length,png+12);
- if (count != (ssize_t) length)
+ png[12]=(unsigned char) icon_info.planes;
+ png[13]=(unsigned char) (icon_info.planes >> 8);
+ png[14]=(unsigned char) icon_info.bits_per_pixel;
+ png[15]=(unsigned char) (icon_info.bits_per_pixel >> 8);
+ count=ReadBlob(image,length-16,png+16);
+ if (count != (ssize_t) (length-16))
{
png=(unsigned char *) RelinquishMagickMemory(png);
ThrowReaderException(CorruptImageError,
}
read_info=CloneImageInfo(image_info);
(void) CopyMagickString(read_info->magick,"PNG",MaxTextExtent);
- icon_image=BlobToImage(read_info,png,length+12,exception);
+ icon_image=BlobToImage(read_info,png,length+16,exception);
read_info=DestroyImageInfo(read_info);
png=(unsigned char *) RelinquishMagickMemory(png);
if (icon_image == (Image *) NULL)
}
else
{
- icon_info.planes=ReadBlobLSBShort(image);
- icon_info.bits_per_pixel=ReadBlobLSBShort(image);
if (icon_info.bits_per_pixel > 32)
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
icon_info.compression=ReadBlobLSBLong(image);
icon_info.y_pixels=ReadBlobLSBLong(image);
icon_info.number_colors=ReadBlobLSBLong(image);
icon_info.colors_important=ReadBlobLSBLong(image);
- image->matte=MagickTrue;
- image->columns=(unsigned long) icon_file.directory[i].width;
- image->rows=(unsigned long) icon_file.directory[i].height;
- image->depth=8;
+ image->alpha_trait=BlendPixelTrait;
+ image->columns=(size_t) icon_file.directory[i].width;
+ if ((ssize_t) image->columns > icon_info.width)
+ image->columns=(size_t) icon_info.width;
+ if (image->columns == 0)
+ image->columns=256;
+ image->rows=(size_t) icon_file.directory[i].height;
+ if ((ssize_t) image->rows > icon_info.height)
+ image->rows=(size_t) icon_info.height;
+ if (image->rows == 0)
+ image->rows=256;
+ image->depth=icon_info.bits_per_pixel;
if (image->debug != MagickFalse)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " scene = %ld",i);
+ " scene = %.20g",(double) i);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " size = %ld",icon_info.size);
+ " size = %.20g",(double) icon_info.size);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " width = %d",icon_file.directory[i].width);
+ " width = %.20g",(double) icon_file.directory[i].width);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " height = %d",icon_file.directory[i].height);
+ " height = %.20g",(double) icon_file.directory[i].height);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " colors = %ld",icon_info.number_colors);
+ " colors = %.20g",(double ) icon_info.number_colors);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " planes = %d",icon_info.planes);
+ " planes = %.20g",(double) icon_info.planes);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " bpp = %d",icon_info.bits_per_pixel);
+ " bpp = %.20g",(double) icon_info.bits_per_pixel);
}
if ((icon_info.number_colors != 0) || (icon_info.bits_per_pixel <= 16))
{
image->storage_class=PseudoClass;
image->colors=icon_info.number_colors;
if (image->colors == 0)
- image->colors=1 << icon_info.bits_per_pixel;
+ image->colors=one << icon_info.bits_per_pixel;
}
if (image->storage_class == PseudoClass)
{
- register long
+ register ssize_t
i;
+ size_t
+ number_colors,
+ one;
+
unsigned char
*icon_colormap;
- unsigned long
- number_colors;
-
/*
Read Icon raster colormap.
*/
- number_colors=1UL << icon_info.bits_per_pixel;
- if (AcquireImageColormap(image,number_colors) == MagickFalse)
+ one=1;
+ number_colors=one << icon_info.bits_per_pixel;
+ if (AcquireImageColormap(image,number_colors,exception) == MagickFalse)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
icon_colormap=(unsigned char *) AcquireQuantumMemory((size_t)
image->colors,4UL*sizeof(*icon_colormap));
ThrowReaderException(CorruptImageError,
"InsufficientImageDataInFile");
p=icon_colormap;
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
image->colormap[i].blue=(Quantum) ScaleCharToQuantum(*p++);
image->colormap[i].green=(Quantum) ScaleCharToQuantum(*p++);
break;
bytes_per_line=(((image->columns*icon_info.bits_per_pixel)+31) &
~31) >> 3;
+ (void) bytes_per_line;
scanline_pad=((((image->columns*icon_info.bits_per_pixel)+31) & ~31)-
(image->columns*icon_info.bits_per_pixel)) >> 3;
switch (icon_info.bits_per_pixel)
/*
Convert bitmap scanline.
*/
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (long) (image->columns-7); x+=8)
+ for (x=0; x < (ssize_t) (image->columns-7); x+=8)
{
- byte=(unsigned long) ReadBlobByte(image);
+ byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < 8; bit++)
- indexes[x+bit]=(IndexPacket)
- ((byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
+ {
+ SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
+ 0x00),q);
+ q+=GetPixelChannels(image);
+ }
}
if ((image->columns % 8) != 0)
{
- byte=(unsigned long) ReadBlobByte(image);
+ byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < (image->columns % 8); bit++)
- indexes[x+bit]=(IndexPacket)
- ((byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
+ {
+ SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
+ 0x00),q);
+ q+=GetPixelChannels(image);
+ }
}
- for (x=0; x < (long) scanline_pad; x++)
+ for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
/*
Read 4-bit Icon scanline.
*/
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < ((long) image->columns-1); x+=2)
+ for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
- byte=(unsigned long) ReadBlobByte(image);
- indexes[x]=(IndexPacket) ((byte >> 4) & 0xf);
- indexes[x+1]=(IndexPacket) ((byte) & 0xf);
+ byte=(size_t) ReadBlobByte(image);
+ SetPixelIndex(image,((byte >> 4) & 0xf),q);
+ q+=GetPixelChannels(image);
+ SetPixelIndex(image,((byte) & 0xf),q);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
- byte=(unsigned long) ReadBlobByte(image);
- indexes[x]=(IndexPacket) ((byte >> 4) & 0xf);
+ byte=(size_t) ReadBlobByte(image);
+ SetPixelIndex(image,((byte >> 4) & 0xf),q);
+ q+=GetPixelChannels(image);
}
- for (x=0; x < (long) scanline_pad; x++)
+ for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
/*
Convert PseudoColor scanline.
*/
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- byte=(unsigned long) ReadBlobByte(image);
- indexes[x]=(IndexPacket) byte;
+ byte=(size_t) ReadBlobByte(image);
+ SetPixelIndex(image,byte,q);
+ q+=GetPixelChannels(image);
}
- for (x=0; x < (long) scanline_pad; x++)
+ for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
/*
Convert PseudoColor scanline.
*/
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- byte=(unsigned long) ReadBlobByte(image);
- byte|=(unsigned long) (ReadBlobByte(image) << 8);
- indexes[x]=(IndexPacket) byte;
+ byte=(size_t) ReadBlobByte(image);
+ byte|=(size_t) (ReadBlobByte(image) << 8);
+ SetPixelIndex(image,byte,q);
+ q+=GetPixelChannels(image);
}
- for (x=0; x < (long) scanline_pad; x++)
+ for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
/*
Convert DirectColor scanline.
*/
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- q->blue=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
- q->green=ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image));
- q->red=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
if (icon_info.bits_per_pixel == 32)
- q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(
- (unsigned char) ReadBlobByte(image)));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ q+=GetPixelChannels(image);
}
if (icon_info.bits_per_pixel == 24)
- for (x=0; x < (long) scanline_pad; x++)
+ for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
default:
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
}
- (void) SyncImage(image);
+ if (image_info->ping == MagickFalse)
+ (void) SyncImage(image,exception);
if (icon_info.bits_per_pixel != 32)
{
/*
Read the ICON alpha mask.
*/
image->storage_class=DirectClass;
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- for (x=0; x < ((long) image->columns-7); x+=8)
+ for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
- byte=(unsigned long) ReadBlobByte(image);
+ byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < 8; bit++)
- q[x+bit].opacity=(Quantum) (((byte & (0x80 >> bit)) != 0) ?
- TransparentOpacity : OpaqueOpacity);
+ {
+ SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
+ TransparentAlpha : OpaqueAlpha),q);
+ q+=GetPixelChannels(image);
+ }
}
if ((image->columns % 8) != 0)
{
- byte=(unsigned long) ReadBlobByte(image);
+ byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < (image->columns % 8); bit++)
- q[x+bit].opacity=(Quantum) (((byte & (0x80 >> bit)) != 0) ?
- TransparentOpacity : OpaqueOpacity);
+ {
+ SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
+ TransparentAlpha : OpaqueAlpha),q);
+ q+=GetPixelChannels(image);
+ }
}
if ((image->columns % 32) != 0)
- for (x=0; x < (long) ((32-(image->columns % 32))/8); x++)
+ for (x=0; x < (ssize_t) ((32-(image->columns % 32))/8); x++)
(void) ReadBlobByte(image);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image_info->number_scenes != 0)
if (image->scene >= (image_info->scene+image_info->number_scenes-1))
break;
- if (i < (long) (icon_file.count-1))
+ if (i < (ssize_t) (icon_file.count-1))
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
%
% The format of the RegisterICONImage method is:
%
-% unsigned long RegisterICONImage(void)
+% size_t RegisterICONImage(void)
%
*/
-ModuleExport unsigned long RegisterICONImage(void)
+ModuleExport size_t RegisterICONImage(void)
{
MagickInfo
*entry;
% image format, version 3 for Windows or (if the image has a matte channel)
% version 4.
%
+% It encodes any subimage as a compressed PNG image ("BI_PNG)", only when its
+% dimensions are 256x256 and image->compression is undefined or is defined as
+% ZipCompression.
+%
% The format of the WriteICONImage method is:
%
% MagickBooleanType WriteICONImage(const ImageInfo *image_info,
-% Image *image)
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
- Image *image)
+ Image *image,ExceptionInfo *exception)
{
IconFile
icon_file;
Image
*next;
- long
- y;
-
MagickBooleanType
status;
offset,
scene;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
- register long
+ register ssize_t
i,
x;
register unsigned char
*q;
+ size_t
+ bytes_per_line,
+ scanline_pad;
+
+ ssize_t
+ y;
+
unsigned char
bit,
byte,
*pixels;
- unsigned long
- bytes_per_line,
- scanline_pad;
-
/*
Open output image file.
*/
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s",image->filename);
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ assert(exception != (ExceptionInfo *) NULL);
+ assert(exception->signature == MagickSignature);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
scene=0;
(void) WriteBlobByte(image,icon_file.directory[scene].reserved);
(void) WriteBlobLSBShort(image,icon_file.directory[scene].planes);
(void) WriteBlobLSBShort(image,icon_file.directory[scene].bits_per_pixel);
- (void) WriteBlobLSBLong(image,icon_file.directory[scene].size);
- (void) WriteBlobLSBLong(image,icon_file.directory[scene].offset);
+ (void) WriteBlobLSBLong(image,(unsigned int)
+ icon_file.directory[scene].size);
+ (void) WriteBlobLSBLong(image,(unsigned int)
+ icon_file.directory[scene].offset);
scene++;
next=SyncNextImageInList(next);
} while ((next != (Image *) NULL) && (image_info->adjoin != MagickFalse));
next=image;
do
{
- if ((next->columns == 256) && (next->rows == 256))
+ if ((next->columns > 255L) && (next->rows > 255L) &&
+ ((next->compression == UndefinedCompression) ||
+ (next->compression == ZipCompression)))
{
Image
*write_image;
unsigned char
*png;
- /*
- Icon image encoded as a compressed PNG image.
- */
- write_image=CloneImage(next,0,0,MagickTrue,&image->exception);
+ write_image=CloneImage(next,0,0,MagickTrue,exception);
if (write_image == (Image *) NULL)
return(MagickFalse);
write_info=CloneImageInfo(image_info);
(void) CopyMagickString(write_info->filename,"PNG:",MaxTextExtent);
+
+ /* Don't write any ancillary chunks except for gAMA */
+ (void) SetImageArtifact(write_image,"png:include-chunk","none,gama");
+
+ /* Only write PNG32 formatted PNG (32-bit RGBA), 8 bits per channel */
+ (void) SetImageArtifact(write_image,"png:format","png32");
+
png=(unsigned char *) ImageToBlob(write_info,write_image,&length,
- &image->exception);
+ exception);
write_image=DestroyImage(write_image);
write_info=DestroyImageInfo(write_info);
if (png == (unsigned char *) NULL)
icon_file.directory[scene].reserved=0;
icon_file.directory[scene].planes=1;
icon_file.directory[scene].bits_per_pixel=32;
- icon_file.directory[scene].size=(unsigned long) length;
- icon_file.directory[scene].offset=(unsigned long) TellBlob(image);
+ icon_file.directory[scene].size=(size_t) length;
+ icon_file.directory[scene].offset=(size_t) TellBlob(image);
(void) WriteBlob(image,(size_t) length,png);
png=(unsigned char *) RelinquishMagickMemory(png);
}
/*
Initialize ICON raster file header.
*/
- if (next->colorspace != RGBColorspace)
- (void) TransformImageColorspace(next,RGBColorspace);
+ if (IssRGBCompatibleColorspace(next->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(next,sRGBColorspace,exception);
icon_info.file_size=14+12+28;
icon_info.offset_bits=icon_info.file_size;
icon_info.compression=BI_RGB;
if ((next->storage_class != DirectClass) && (next->colors > 256))
- (void) SetImageStorageClass(next,DirectClass);
+ (void) SetImageStorageClass(next,DirectClass,exception);
if (next->storage_class == DirectClass)
{
/*
*/
icon_info.number_colors=0;
icon_info.bits_per_pixel=32;
- icon_info.compression=(unsigned long) BI_RGB;
+ icon_info.compression=(size_t) BI_RGB;
}
else
{
+ size_t
+ one;
+
/*
Colormapped ICON raster.
*/
icon_info.bits_per_pixel=4;
if (next->colors <= 2)
icon_info.bits_per_pixel=1;
- icon_info.number_colors=1 << icon_info.bits_per_pixel;
+ one=1;
+ icon_info.number_colors=one << icon_info.bits_per_pixel;
if (icon_info.number_colors < next->colors)
{
- (void) SetImageStorageClass(next,DirectClass);
+ (void) SetImageStorageClass(next,DirectClass,exception);
icon_info.number_colors=0;
icon_info.bits_per_pixel=(unsigned short) 24;
- icon_info.compression=(unsigned long) BI_RGB;
+ icon_info.compression=(size_t) BI_RGB;
}
else
{
- icon_info.file_size+=3*(1UL << icon_info.bits_per_pixel);
- icon_info.offset_bits+=3*(1UL << icon_info.bits_per_pixel);
- icon_info.file_size+=(1UL << icon_info.bits_per_pixel);
- icon_info.offset_bits+=(1UL << icon_info.bits_per_pixel);
+ size_t
+ one;
+
+ one=1;
+ icon_info.file_size+=3*(one << icon_info.bits_per_pixel);
+ icon_info.offset_bits+=3*(one << icon_info.bits_per_pixel);
+ icon_info.file_size+=(one << icon_info.bits_per_pixel);
+ icon_info.offset_bits+=(one << icon_info.bits_per_pixel);
}
}
bytes_per_line=(((next->columns*icon_info.bits_per_pixel)+31) &
~31) >> 3;
icon_info.ba_offset=0;
- icon_info.width=(long) next->columns;
- icon_info.height=(long) next->rows;
+ icon_info.width=(ssize_t) next->columns;
+ icon_info.height=(ssize_t) next->rows;
icon_info.planes=1;
icon_info.image_size=bytes_per_line*next->rows;
icon_info.size=40;
case UndefinedResolution:
case PixelsPerInchResolution:
{
- icon_info.x_pixels=(unsigned long) (100.0*next->x_resolution/2.54);
- icon_info.y_pixels=(unsigned long) (100.0*next->y_resolution/2.54);
+ icon_info.x_pixels=(size_t) (100.0*next->resolution.x/2.54);
+ icon_info.y_pixels=(size_t) (100.0*next->resolution.y/2.54);
break;
}
case PixelsPerCentimeterResolution:
{
- icon_info.x_pixels=(unsigned long) (100.0*next->x_resolution);
- icon_info.y_pixels=(unsigned long) (100.0*next->y_resolution);
+ icon_info.x_pixels=(size_t) (100.0*next->resolution.x);
+ icon_info.y_pixels=(size_t) (100.0*next->resolution.y);
break;
}
}
{
case 1:
{
- unsigned long
+ size_t
bit,
byte;
/*
Convert PseudoClass image to a ICON monochrome image.
*/
- for (y=0; y < (long) next->rows; y++)
+ for (y=0; y < (ssize_t) next->rows; y++)
{
- p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(next,0,y,next->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(next);
q=pixels+(next->rows-y-1)*bytes_per_line;
bit=0;
byte=0;
- for (x=0; x < (long) next->columns; x++)
+ for (x=0; x < (ssize_t) next->columns; x++)
{
byte<<=1;
- byte|=indexes[x] != 0 ? 0x01 : 0x00;
+ byte|=GetPixelIndex(next,p) != 0 ? 0x01 : 0x00;
bit++;
if (bit == 8)
{
bit=0;
byte=0;
}
- }
+ p+=GetPixelChannels(image);
+ }
if (bit != 0)
*q++=(unsigned char) (byte << (8-bit));
if (next->previous == (Image *) NULL)
}
case 4:
{
- unsigned long
+ size_t
nibble,
byte;
/*
Convert PseudoClass image to a ICON monochrome image.
*/
- for (y=0; y < (long) next->rows; y++)
+ for (y=0; y < (ssize_t) next->rows; y++)
{
- p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(next,0,y,next->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(next);
q=pixels+(next->rows-y-1)*bytes_per_line;
nibble=0;
byte=0;
- for (x=0; x < (long) next->columns; x++)
+ for (x=0; x < (ssize_t) next->columns; x++)
{
byte<<=4;
- byte|=((unsigned long) indexes[x] & 0x0f);
+ byte|=((size_t) GetPixelIndex(next,p) & 0x0f);
nibble++;
if (nibble == 2)
{
nibble=0;
byte=0;
}
- }
+ p+=GetPixelChannels(image);
+ }
if (nibble != 0)
*q++=(unsigned char) (byte << 4);
if (next->previous == (Image *) NULL)
/*
Convert PseudoClass packet to ICON pixel.
*/
- for (y=0; y < (long) next->rows; y++)
+ for (y=0; y < (ssize_t) next->rows; y++)
{
- p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(next,0,y,next->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(next);
q=pixels+(next->rows-y-1)*bytes_per_line;
- for (x=0; x < (long) next->columns; x++)
- *q++=(unsigned char) indexes[x];
+ for (x=0; x < (ssize_t) next->columns; x++)
+ {
+ *q++=(unsigned char) GetPixelIndex(next,p);
+ p+=GetPixelChannels(image);
+ }
if (next->previous == (Image *) NULL)
{
status=SetImageProgress(next,SaveImageTag,y,next->rows);
/*
Convert DirectClass packet to ICON BGR888 or BGRA8888 pixel.
*/
- for (y=0; y < (long) next->rows; y++)
+ for (y=0; y < (ssize_t) next->rows; y++)
{
- p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(next,0,y,next->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
q=pixels+(next->rows-y-1)*bytes_per_line;
- for (x=0; x < (long) next->columns; x++)
+ for (x=0; x < (ssize_t) next->columns; x++)
{
- *q++=ScaleQuantumToChar(GetBlueSample(p));
- *q++=ScaleQuantumToChar(GetGreenSample(p));
- *q++=ScaleQuantumToChar(GetRedSample(p));
- if (next->matte == MagickFalse)
+ *q++=ScaleQuantumToChar(GetPixelBlue(next,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(next,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(next,p));
+ if (next->alpha_trait != BlendPixelTrait)
*q++=ScaleQuantumToChar(QuantumRange);
else
- *q++=ScaleQuantumToChar(QuantumRange-GetOpacitySample(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelAlpha(next,p));
+ p+=GetPixelChannels(next);
}
if (icon_info.bits_per_pixel == 24)
- for (x=3L*(long) next->columns; x < (long) bytes_per_line; x++)
+ for (x=3L*(ssize_t) next->columns; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
if (next->previous == (Image *) NULL)
{
icon_file.directory[scene].planes=icon_info.planes;
icon_file.directory[scene].bits_per_pixel=icon_info.bits_per_pixel;
icon_file.directory[scene].size=icon_info.size;
- icon_file.directory[scene].offset=(unsigned long) TellBlob(image);
- (void) WriteBlobLSBLong(image,(unsigned long) 40);
- (void) WriteBlobLSBLong(image,(unsigned long) icon_info.width);
- (void) WriteBlobLSBLong(image,(unsigned long) icon_info.height*2);
+ icon_file.directory[scene].offset=(size_t) TellBlob(image);
+ (void) WriteBlobLSBLong(image,(unsigned int) 40);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.width);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.height*2);
(void) WriteBlobLSBShort(image,icon_info.planes);
(void) WriteBlobLSBShort(image,icon_info.bits_per_pixel);
- (void) WriteBlobLSBLong(image,icon_info.compression);
- (void) WriteBlobLSBLong(image,icon_info.image_size);
- (void) WriteBlobLSBLong(image,icon_info.x_pixels);
- (void) WriteBlobLSBLong(image,icon_info.y_pixels);
- (void) WriteBlobLSBLong(image,icon_info.number_colors);
- (void) WriteBlobLSBLong(image,icon_info.colors_important);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.compression);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.image_size);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.x_pixels);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.y_pixels);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.number_colors);
+ (void) WriteBlobLSBLong(image,(unsigned int) icon_info.colors_important);
if (next->storage_class == PseudoClass)
{
unsigned char
if (icon_colormap == (unsigned char *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
q=icon_colormap;
- for (i=0; i < (long) next->colors; i++)
+ for (i=0; i < (ssize_t) next->colors; i++)
{
*q++=ScaleQuantumToChar(next->colormap[i].blue);
*q++=ScaleQuantumToChar(next->colormap[i].green);
*q++=ScaleQuantumToChar(next->colormap[i].red);
*q++=(unsigned char) 0x0;
}
- for ( ; i < (long) (1UL << icon_info.bits_per_pixel); i++)
+ for ( ; i < (ssize_t) (1UL << icon_info.bits_per_pixel); i++)
{
*q++=(unsigned char) 0x00;
*q++=(unsigned char) 0x00;
Write matte mask.
*/
scanline_pad=(((next->columns+31) & ~31)-next->columns) >> 3;
- for (y=((long) next->rows - 1); y >= 0; y--)
+ for (y=((ssize_t) next->rows - 1); y >= 0; y--)
{
- p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(next,0,y,next->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
- for (x=0; x < (long) next->columns; x++)
+ for (x=0; x < (ssize_t) next->columns; x++)
{
byte<<=1;
- if ((next->matte == MagickTrue) &&
- (p->opacity == (Quantum) TransparentOpacity))
+ if ((next->alpha_trait == BlendPixelTrait) &&
+ (GetPixelAlpha(next,p) == (Quantum) TransparentAlpha))
byte|=0x01;
bit++;
if (bit == 8)
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(next);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
- for (i=0; i < (long) scanline_pad; i++)
+ for (i=0; i < (ssize_t) scanline_pad; i++)
(void) WriteBlobByte(image,(unsigned char) 0);
}
}
break;
} while ((next != (Image *) NULL) && (image_info->adjoin != MagickFalse));
offset=SeekBlob(image,0,SEEK_SET);
+ (void) offset;
(void) WriteBlobLSBShort(image,0);
(void) WriteBlobLSBShort(image,1);
(void) WriteBlobLSBShort(image,(unsigned short) (scene+1));
(void) WriteBlobByte(image,icon_file.directory[scene].reserved);
(void) WriteBlobLSBShort(image,icon_file.directory[scene].planes);
(void) WriteBlobLSBShort(image,icon_file.directory[scene].bits_per_pixel);
- (void) WriteBlobLSBLong(image,icon_file.directory[scene].size);
- (void) WriteBlobLSBLong(image,icon_file.directory[scene].offset);
+ (void) WriteBlobLSBLong(image,(unsigned int)
+ icon_file.directory[scene].size);
+ (void) WriteBlobLSBLong(image,(unsigned int)
+ icon_file.directory[scene].offset);
scene++;
next=SyncNextImageInList(next);
} while ((next != (Image *) NULL) && (image_info->adjoin != MagickFalse));