% July 1992 %
% %
% %
-% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2011 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 %
#define PS3_PseudoClass "1"
#if defined(MAGICKCORE_TIFF_DELEGATE)
-#include "tiffio.h"
#define CCITTParam "-1"
#else
#define CCITTParam "0"
%
% The format of the RegisterPS3Image method is:
%
-% unsigned long RegisterPS3Image(void)
+% size_t RegisterPS3Image(void)
%
*/
-ModuleExport unsigned long RegisterPS3Image(void)
+ModuleExport size_t RegisterPS3Image(void)
{
MagickInfo
*entry;
entry->encoder=(EncodeImageHandler *) WritePS3Image;
entry->description=ConstantString("Level III Encapsulated PostScript");
entry->module=ConstantString("PS3");
+ entry->seekable_stream=MagickTrue;
(void) RegisterMagickInfo(entry);
entry=SetMagickInfo("PS3");
entry->encoder=(EncodeImageHandler *) WritePS3Image;
entry->description=ConstantString("Level III PostScript");
entry->module=ConstantString("PS3");
+ entry->seekable_stream=MagickTrue;
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);
}
unsigned char
*group4;
+ status=MagickTrue;
write_info=CloneImageInfo(image_info);
(void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent);
(void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent);
return(status);
}
-
static MagickBooleanType SerializeImage(const ImageInfo *image_info,
Image *image,unsigned char **pixels,size_t *length)
{
- long
- y;
-
MagickBooleanType
status;
register const PixelPacket
*p;
- register long
+ register ssize_t
x;
register unsigned char
*q;
+ ssize_t
+ y;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
- *length=(image->colorspace == CMYKColorspace ? 4 : 3)*
- (size_t) image->columns*image->rows;
+ *length=(image->colorspace == CMYKColorspace ? 4 : 3)*(size_t)
+ image->columns*image->rows;
*pixels=(unsigned char *) AcquireQuantumMemory(*length,sizeof(**pixels));
if (*pixels == (unsigned char *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
q=(*pixels);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(image);
if (image->colorspace != CMYKColorspace)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(p->red);
- *q++=ScaleQuantumToChar(p->green);
- *q++=ScaleQuantumToChar(p->blue);
+ *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
p++;
}
else
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(p->red);
- *q++=ScaleQuantumToChar(p->green);
- *q++=ScaleQuantumToChar(p->blue);
- *q++=ScaleQuantumToChar(indexes[x]);
+ *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
p++;
}
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
static MagickBooleanType SerializeImageChannel(const ImageInfo *image_info,
Image *image,unsigned char **pixels,size_t *length)
{
- long
- y;
-
MagickBooleanType
status;
register const PixelPacket
*p;
- register long
+ register ssize_t
x;
register unsigned char
*q;
+ size_t
+ pack,
+ padded_columns;
+
+ ssize_t
+ y;
+
unsigned char
code,
bit;
- unsigned long
- pack,
- padded_columns;
-
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
if (*pixels == (unsigned char *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
q=(*pixels);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
if (p == (const PixelPacket *) NULL)
break;
if (pack == 1)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
p++;
else
{
code='\0';
- for (x=0; x < (long) padded_columns; x++)
+ for (x=0; x < (ssize_t) padded_columns; x++)
{
bit=(unsigned char) 0x00;
- if (x < (long) image->columns)
- bit=(unsigned char) (PixelIntensityToQuantum(p) ==
- (Quantum) TransparentOpacity ? 0x01 : 0x00);
+ if (x < (ssize_t) image->columns)
+ bit=(unsigned char) (PixelIntensityToQuantum(p) == (Quantum)
+ TransparentOpacity ? 0x01 : 0x00);
code=(code << 1)+bit;
if (((x+1) % pack) == 0)
{
p++;
}
}
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info,
Image *image,unsigned char **pixels,size_t *length)
{
- long
- y;
-
MagickBooleanType
status;
register const PixelPacket
*p;
- register long
+ register ssize_t
x;
register unsigned char
*q;
+ ssize_t
+ y;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
if (*pixels == (unsigned char *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
q=(*pixels);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
- *q++=(unsigned char) indexes[x];
+ for (x=0; x < (ssize_t) image->columns; x++)
+ *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
start,
stop;
- register long
+ register ssize_t
i;
size_t
*/
start=TellBlob(image);
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%BeginData:%13ld %s Bytes\n",0L,
- compression == NoCompression ? "ASCII" : "BINARY");
+ "%%%%BeginData:%13ld %s Bytes\n",0L,compression == NoCompression ?
+ "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
stop=TellBlob(image);
/*
default:
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "currentfile %lu %lu "PS3_NoCompression" ByteStreamDecodeFilter\n",
- image->columns,image->rows);
+ "currentfile %.20g %.20g "PS3_NoCompression" ByteStreamDecodeFilter\n",
+ (double) image->columns,(double) image->rows);
break;
}
case FaxCompression:
case Group4Compression:
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "currentfile %lu %lu "PS3_FaxCompression" ByteStreamDecodeFilter\n",
- image->columns,image->rows);
+ "currentfile %.20g %.20g "PS3_FaxCompression" ByteStreamDecodeFilter\n",
+ (double) image->columns,(double) image->rows);
break;
}
case LZWCompression:
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "currentfile %lu %lu "PS3_LZWCompression" ByteStreamDecodeFilter\n",
- image->columns,image->rows);
+ "currentfile %.20g %.20g "PS3_LZWCompression" ByteStreamDecodeFilter\n",
+ (double) image->columns,(double) image->rows);
break;
}
case RLECompression:
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "currentfile %lu %lu "PS3_RLECompression" ByteStreamDecodeFilter\n",
- image->columns,image->rows);
+ "currentfile %.20g %.20g "PS3_RLECompression" ByteStreamDecodeFilter\n",
+ (double) image->columns,(double) image->rows);
break;
}
case ZipCompression:
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "currentfile %lu %lu "PS3_ZipCompression" ByteStreamDecodeFilter\n",
- image->columns,image->rows);
+ "currentfile %.20g %.20g "PS3_ZipCompression" ByteStreamDecodeFilter\n",
+ (double) image->columns,(double) image->rows);
break;
}
}
if (status == MagickFalse)
break;
Ascii85Initialize(image);
- for (i=0; i < (long) length; i++)
+ for (i=0; i < (ssize_t) length; i++)
Ascii85Encode(image,pixels[i]);
Ascii85Flush(image);
pixels=(unsigned char *) RelinquishMagickMemory(pixels);
GeometryInfo
geometry_info;
- long
- j;
-
MagickBooleanType
status;
media_info,
page_info;
- register long
+ register ssize_t
i;
SegmentInfo
bounds;
size_t
- length;
+ length,
+ page,
+ pixel,
+ text_size;
+
+ ssize_t
+ j;
time_t
timer;
unsigned char
*pixels;
- unsigned long
- page,
- pixel,
- text_size;
-
/*
Open output image file.
*/
}
if (image->units == PixelsPerCentimeterResolution)
{
- resolution.x*=2.54;
- resolution.y*=2.54;
+ resolution.x=(size_t) (100.0*2.54*resolution.x+0.5)/100.0;
+ resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0;
}
SetGeometry(image,&geometry);
- (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu",
- image->columns,image->rows);
+ (void) FormatMagickString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (double) image->columns,(double) image->rows);
if (image_info->page != (char *) NULL)
(void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent);
else
if ((image->page.width != 0) && (image->page.height != 0))
- (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu%+ld%+ld",
- image->page.width,image->page.height,image->page.x,image->page.y);
+ (void) FormatMagickString(page_geometry,MaxTextExtent,
+ "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
+ image->page.height,(double) image->page.x,(double) image->page.y);
else
if ((image->gravity != UndefinedGravity) &&
(LocaleCompare(image_info->magick,"PS") == 0))
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=(double) (geometry.width*delta.x)/resolution.x;
- geometry.width=(unsigned long) (scale.x+0.5);
+ geometry.width=(size_t) floor(scale.x+0.5);
scale.y=(double) (geometry.height*delta.y)/resolution.y;
- geometry.height=(unsigned long) (scale.y+0.5);
+ geometry.height=(size_t) floor(scale.y+0.5);
(void) ParseAbsoluteGeometry(page_geometry,&media_info);
(void) ParseGravityGeometry(image,page_geometry,&page_info,
&image->exception);
if (image->gravity != UndefinedGravity)
{
geometry.x=(-page_info.x);
- geometry.y=(long) (media_info.height+page_info.y-image->rows);
+ geometry.y=(ssize_t) (media_info.height+page_info.y-image->rows);
}
pointsize=12.0;
if (image_info->pointsize != 0.0)
text_size=0;
value=GetImageProperty(image,"label");
if (value != (const char *) NULL)
- text_size=(unsigned long) (MultilineCensus(value)*pointsize+12);
+ text_size=(size_t) (MultilineCensus(value)*pointsize+12);
page++;
if (page == 1)
{
floor(bounds.y1+0.5),ceil(bounds.x2-0.5),ceil(bounds.y2-0.5));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,
- bounds.x2,bounds.y2);
+ "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
+ bounds.y1,bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
if (image->colorspace == CMYKColorspace)
(void) WriteBlobString(image,
if (image_info->adjoin == MagickFalse)
(void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent);
else
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Pages: %lu\n",
- (unsigned long) GetImageListLength(image));
+ (void) FormatMagickString(buffer,MaxTextExtent,
+ "%%%%Pages: %.20g\n",(double) GetImageListLength(image));
(void) WriteBlobString(image,buffer);
}
(void) WriteBlobString(image,"%%EndComments\n");
{
(void) WriteBlobString(image,"\n %% Labels.\n /Helvetica "
" findfont pointsize scalefont setfont\n");
- for (i=(long) MultilineCensus(value)-1; i >= 0; i--)
+ for (i=(ssize_t) MultilineCensus(value)-1; i >= 0; i--)
{
(void) WriteBlobString(image,
" currentfile buffer readline pop token pop\n");
}
(void)WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n",page);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (double) page);
(void) WriteBlobString(image,buffer);
/*
Page bounding box.
*/
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%PageBoundingBox: %ld %ld %ld %ld\n",geometry.x,geometry.y,geometry.x+
- (long) geometry.width,geometry.y+(long) (geometry.height+text_size));
+ "%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
+ (double) geometry.y,geometry.x+(double) geometry.width,geometry.y+
+ (double) (geometry.height+text_size));
(void) WriteBlobString(image,buffer);
/*
Page process colors if not RGB.
/*
Translate, scale, and font point size.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld\n%g %g\n%f\n",
- geometry.x,geometry.y,scale.x,scale.y,pointsize);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize);
(void) WriteBlobString(image,buffer);
/*
Output labels.
/*
Image columns, rows, and color space.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n%s\n",
- image->columns,image->rows,image->colorspace == CMYKColorspace ?
- PS3_CMYKColorspace : PS3_RGBColorspace);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n%s\n",
+ (double) image->columns,(double) image->rows,image->colorspace ==
+ CMYKColorspace ? PS3_CMYKColorspace : PS3_RGBColorspace);
(void) WriteBlobString(image,buffer);
/*
Masked image?
default:
{
Ascii85Initialize(image);
- for (i=0; i < (long) length; i++)
+ for (i=0; i < (ssize_t) length; i++)
Ascii85Encode(image,pixels[i]);
Ascii85Flush(image);
status=MagickTrue;
default:
{
Ascii85Initialize(image);
- for (i=0; i < (long) length; i++)
+ for (i=0; i < (ssize_t) length; i++)
Ascii85Encode(image,pixels[i]);
Ascii85Flush(image);
status=MagickTrue;
/*
Number of colors in color map.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",
- image->colors);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",
+ (double) image->colors);
(void) WriteBlobString(image,buffer);
/*
Color map - uncompressed.
if ((compression != NoCompression) &&
(compression != UndefinedCompression))
{
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
pixel=ScaleQuantumToChar(image->colormap[i].red);
(void) WriteBlobByte(image,(unsigned char) pixel);
else
{
Ascii85Initialize(image);
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
pixel=ScaleQuantumToChar(image->colormap[i].red);
Ascii85Encode(image,(unsigned char) pixel);
default:
{
Ascii85Initialize(image);
- for (i=0; i < (long) length; i++)
+ for (i=0; i < (ssize_t) length; i++)
Ascii85Encode(image,pixels[i]);
Ascii85Flush(image);
status=MagickTrue;
projects / imagemagick / blobdiff