% July 1992 %
% %
% %
-% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2010 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 "magick/transform.h"
#include "magick/utility.h"
#include "magick/module.h"
+\f
+/*
+ Define declarations.
+*/
#if defined(MAGICKCORE_TIFF_DELEGATE)
-#if defined(MAGICKCORE_HAVE_TIFFCONF_H)
-#include "tiffconf.h"
-#endif
-#include "tiffio.h"
#define CCITTParam "-1"
#else
#define CCITTParam "0"
int
status;
-#if defined(MAGICKCORE_GS_DELEGATE) || defined(__WINDOWS__)
+#if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT)
char
**argv;
argc,
code;
- register long
+ register ssize_t
i;
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
ghost_info=NTGhostscriptDLLVectors();
#else
GhostInfo
#endif
if (ghost_info == (GhostInfo *) NULL)
{
- status=SystemCommand(verbose,command,exception);
+ status=SystemCommand(MagickFalse,verbose,command,exception);
return(status == 0 ? MagickTrue : MagickFalse);
}
if (verbose != MagickFalse)
status=(ghost_info->new_instance)(&interpreter,(void *) NULL);
if (status < 0)
{
- status=SystemCommand(verbose,command,exception);
+ status=SystemCommand(MagickFalse,verbose,command,exception);
return(status == 0 ? MagickTrue : MagickFalse);
}
argv=StringToArgv(command,&argc);
0,&code);
(ghost_info->exit)(interpreter);
(ghost_info->delete_instance)(interpreter);
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
NTGhostscriptUnLoadDLL();
#endif
- for (i=0; i < (long) argc; i++)
+ for (i=0; i < (ssize_t) argc; i++)
argv[i]=DestroyString(argv[i]);
argv=(char **) RelinquishMagickMemory(argv);
if ((status != 0) && (status != -101))
}
return(MagickTrue);
#else
- status=SystemCommand(verbose,command,exception);
+ status=SystemCommand(MagickFalse,verbose,command,exception);
return(status == 0 ? MagickTrue : MagickFalse);
#endif
}
double
angle;
+ GeometryInfo
+ geometry_info;
+
Image
*image,
*next,
trimbox,
status;
+ MagickStatusType
+ flags;
+
PointInfo
delta;
ssize_t
count;
- unsigned long
+ size_t
scene,
spotcolor;
delta.y=DefaultResolution;
if ((image->x_resolution == 0.0) || (image->y_resolution == 0.0))
{
- GeometryInfo
- geometry_info;
-
- MagickStatusType
- flags;
-
flags=ParseGeometry(PSDensityGeometry,&geometry_info);
image->x_resolution=geometry_info.rho;
image->y_resolution=geometry_info.sigma;
property[MaxTextExtent],
*value;
- register long
+ register ssize_t
i;
/*
Note spot names.
*/
- (void) FormatMagickString(property,MaxTextExtent,"pdf:SpotColor-%lu",
- spotcolor++);
+ (void) FormatMagickString(property,MaxTextExtent,"pdf:SpotColor-%.20g",
+ (double) spotcolor++);
i=0;
for (c=ReadBlobByte(image); c != EOF; c=ReadBlobByte(image))
{
/*
Set PDF render geometry.
*/
- (void) FormatMagickString(geometry,MaxTextExtent,"%gx%g%+g%+g",
- bounds.x2-bounds.x1,bounds.y2-bounds.y1,bounds.x1,bounds.y1);
+ (void) FormatMagickString(geometry,MaxTextExtent,
+ "%gx%g%+.15g%+.15g",bounds.x2-bounds.x1,bounds.y2-bounds.y1,
+ bounds.x1,bounds.y1);
(void) SetImageProperty(image,"pdf:HiResBoundingBox",geometry);
- page.width=(unsigned long) (bounds.x2-bounds.x1+0.5);
- page.height=(unsigned long) (bounds.y2-bounds.y1+0.5);
+ page.width=(size_t) floor(bounds.x2-bounds.x1+0.5);
+ page.height=(size_t) floor(bounds.y2-bounds.y1+0.5);
hires_bounds=bounds;
}
}
(void) CloseBlob(image);
if ((fabs(angle) == 90.0) || (fabs(angle) == 270.0))
{
- unsigned long
+ size_t
swap;
swap=page.width;
return((Image *) NULL);
}
*options='\0';
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",image->x_resolution,
- image->y_resolution);
+ if (image_info->density != (char *) NULL)
+ {
+ flags=ParseGeometry(image_info->density,&geometry_info);
+ image->x_resolution=geometry_info.rho;
+ image->y_resolution=geometry_info.sigma;
+ if ((flags & SigmaValue) == 0)
+ image->y_resolution=image->x_resolution;
+ }
+ (void) FormatMagickString(density,MaxTextExtent,"%gx%g",
+ image->x_resolution,image->y_resolution);
if (image_info->page != (char *) NULL)
{
(void) ParseAbsoluteGeometry(image_info->page,&page);
- page.width=(unsigned long) (page.width*image->x_resolution/delta.x+0.5);
- page.height=(unsigned long) (page.height*image->y_resolution/delta.y+0.5);
- (void) FormatMagickString(options,MaxTextExtent,"-g%lux%lu ",page.width,
- page.height);
+ page.width=(size_t) floor(page.width*image->x_resolution/delta.x+
+ 0.5);
+ page.height=(size_t) floor(page.height*image->y_resolution/delta.y+
+ 0.5);
+ (void) FormatMagickString(options,MaxTextExtent,"-g%.20gx%.20g ",
+ (double) page.width,(double) page.height);
}
if (cmyk != MagickFalse)
(void) ConcatenateMagickString(options,"-dUseCIEColor ",MaxTextExtent);
char
pages[MaxTextExtent];
- (void) FormatMagickString(pages,MaxTextExtent,"-dFirstPage=%lu "
- "-dLastPage=%lu",read_info->scene+1,read_info->scene+
- read_info->number_scenes);
+ (void) FormatMagickString(pages,MaxTextExtent,"-dFirstPage=%.20g "
+ "-dLastPage=%.20g",(double) read_info->scene+1,(double)
+ (read_info->scene+read_info->number_scenes));
(void) ConcatenateMagickString(options,pages,MaxTextExtent);
read_info->number_scenes=0;
if (read_info->scenes != (char *) NULL)
Image
*clone_image;
- register long
+ register ssize_t
i;
/*
Add place holder images to meet the subimage specification requirement.
*/
- for (i=0; i < (long) image_info->scene; i++)
+ for (i=0; i < (ssize_t) image_info->scene; i++)
{
clone_image=CloneImage(pdf_image,1,1,MagickTrue,exception);
if (clone_image != (Image *) NULL)
%
% The format of the RegisterPDFImage method is:
%
-% unsigned long RegisterPDFImage(void)
+% size_t RegisterPDFImage(void)
%
*/
-ModuleExport unsigned long RegisterPDFImage(void)
+ModuleExport size_t RegisterPDFImage(void)
{
MagickInfo
*entry;
register char
*p;
- register long
+ register ssize_t
i;
static char
buffer[MaxTextExtent];
- unsigned long
+ size_t
escapes;
escapes=0;
p=buffer;
- for (i=0; i < (long) MagickMin(strlen(text),(MaxTextExtent-escapes-1)); i++)
+ for (i=0; i < (ssize_t) MagickMin(strlen(text),(MaxTextExtent-escapes-1)); i++)
{
if ((text[i] == '(') || (text[i] == ')'))
{
return(buffer);
}
-#if defined(MAGICKCORE_TIFF_DELEGATE)
static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
Image *image,Image *inject_image)
{
- char
- filename[MaxTextExtent];
-
- FILE
- *file;
-
Image
- *huffman_image;
+ *group4_image;
ImageInfo
*write_info;
- int
- unique_file;
-
MagickBooleanType
status;
- register long
- i;
-
- ssize_t
- count;
-
- TIFF
- *tiff;
-
- uint16
- fillorder;
-
- uint32
- *byte_count,
- strip_size;
+ size_t
+ length;
unsigned char
- *buffer;
+ *group4;
- /*
- Write image as CCITTFax4 TIFF image to a temporary file.
- */
- assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(inject_image != (Image *) NULL);
- assert(inject_image->signature == MagickSignature);
- huffman_image=CloneImage(inject_image,0,0,MagickTrue,&image->exception);
- if (huffman_image == (Image *) NULL)
- return(MagickFalse);
- file=(FILE *) NULL;
- unique_file=AcquireUniqueFileResource(filename);
- if (unique_file != -1)
- file=fdopen(unique_file,"wb");
- if ((unique_file == -1) || (file == (FILE *) NULL))
- {
- ThrowFileException(&image->exception,FileOpenError,
- "UnableToCreateTemporaryFile",filename);
- return(MagickFalse);
- }
- (void) FormatMagickString(huffman_image->filename,MaxTextExtent,"tiff:%s",
- filename);
+ status=MagickTrue;
write_info=CloneImageInfo(image_info);
- SetImageInfoFile(write_info,file);
- write_info->compression=Group4Compression;
- (void) SetImageOption(write_info,"quantum:polarity","min-is-white");
- status=WriteImage(write_info,huffman_image);
- (void) fflush(file);
- write_info=DestroyImageInfo(write_info);
- if (status == MagickFalse)
+ (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent);
+ group4_image=CloneImage(inject_image,0,0,MagickTrue,&image->exception);
+ if (group4_image == (Image *) NULL)
return(MagickFalse);
- tiff=TIFFOpen(filename,"rb");
- if (tiff == (TIFF *) NULL)
- {
- huffman_image=DestroyImage(huffman_image);
- (void) fclose(file);
- (void) RelinquishUniqueFileResource(filename);
- ThrowFileException(&image->exception,FileOpenError,"UnableToOpenFile",
- image_info->filename);
- return(MagickFalse);
- }
- /*
- Allocate raw strip buffer.
- */
- byte_count=0;
- (void) TIFFGetField(tiff,TIFFTAG_STRIPBYTECOUNTS,&byte_count);
- strip_size=byte_count[0];
- for (i=1; i < (long) TIFFNumberOfStrips(tiff); i++)
- if (byte_count[i] > strip_size)
- strip_size=byte_count[i];
- buffer=(unsigned char *) AcquireQuantumMemory((size_t) strip_size,
- sizeof(*buffer));
- if (buffer == (unsigned char *) NULL)
- {
- TIFFClose(tiff);
- huffman_image=DestroyImage(huffman_image);
- (void) fclose(file);
- (void) RelinquishUniqueFileResource(filename);
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image_info->filename);
- }
- /*
- Compress runlength encoded to 2D Huffman pixels.
- */
- fillorder=FILLORDER_LSB2MSB;
- (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_FILLORDER,&fillorder);
- for (i=0; i < (long) TIFFNumberOfStrips(tiff); i++)
- {
- count=(ssize_t) TIFFReadRawStrip(tiff,(uint32) i,buffer,(long)
- byte_count[i]);
- if (fillorder == FILLORDER_LSB2MSB)
- TIFFReverseBits(buffer,(unsigned long) count);
- (void) WriteBlob(image,(size_t) count,buffer);
- }
- buffer=(unsigned char *) RelinquishMagickMemory(buffer);
- TIFFClose(tiff);
- huffman_image=DestroyImage(huffman_image);
- (void) fclose(file);
- (void) RelinquishUniqueFileResource(filename);
- return(MagickTrue);
-}
-#else
-static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
- Image *image,Image *inject_image)
-{
- assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(inject_image != (Image *) NULL);
- assert(inject_image->signature == MagickSignature);
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","`%s' (TIFF)",
- image->filename);
- return(MagickFalse);
+ group4=(unsigned char *) ImageToBlob(write_info,group4_image,&length,
+ &image->exception);
+ group4_image=DestroyImage(group4_image);
+ if (group4 == (unsigned char *) NULL)
+ return(MagickFalse);
+ write_info=DestroyImageInfo(write_info);
+ if (WriteBlob(image,length,group4) != (ssize_t) length)
+ status=MagickFalse;
+ group4=(unsigned char *) RelinquishMagickMemory(group4);
+ return(status);
}
-#endif
static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
{
GeometryInfo
geometry_info;
- long
+ ssize_t
count,
y;
register unsigned char
*q;
- register long
+ register ssize_t
i,
x;
unsigned char
*pixels;
- unsigned long
+ size_t
info_id,
object,
pages_id,
object=0;
version=3;
if (image_info->compression == JPEG2000Compression)
- version=(unsigned long) MagickMax(version,5);
+ version=(size_t) MagickMax(version,5);
for (next=image; next != (Image *) NULL; next=GetNextImageInList(next))
if (next->matte != MagickFalse)
- version=(unsigned long) MagickMax(version,4);
+ version=(size_t) MagickMax(version,4);
if (LocaleCompare(image_info->magick,"PDFA") == 0)
- version=(unsigned long) MagickMax(version,6);
- (void) FormatMagickString(buffer,MaxTextExtent,"%%PDF-1.%lu \n",version);
+ version=(size_t) MagickMax(version,6);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%%PDF-1.%.20g \n",
+ (double) version);
(void) WriteBlobString(image,buffer);
if (LocaleCompare(image_info->magick,"PDFA") == 0)
(void) WriteBlobString(image,"%âãÏÓ\n");
*/
xref[object++]=TellBlob(image);
root_id=object;
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
if (LocaleCompare(image_info->magick,"PDFA") != 0)
- (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",
+ (double) object+1);
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,"/Metadata %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Metadata %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %lu 0 R\n",
- object+2);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",
+ (double) object+2);
}
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Type /Catalog\n");
timestamp[MaxTextExtent],
xmp_profile[MaxTextExtent];
- unsigned long
+ size_t
version;
/*
Write XMP object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",
+ (double) object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Subtype /XML\n");
i=FormatMagickString(xmp_profile,MaxTextExtent,XMPProfile,
XMPProfileMagick,modify_date,create_date,timestamp,
GetMagickVersion(&version),GetMagickVersion(&version));
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu\n",1UL*i);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g\n",
+ (double) i);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Type /Metadata\n");
(void) WriteBlobString(image,">>\nstream\n");
*/
xref[object++]=TellBlob(image);
pages_id=object;
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Type /Pages\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Kids [ %lu 0 R ",object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Kids [ %.20g 0 R ",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
- count=(long) (pages_id+ObjectsPerImage+1);
+ count=(ssize_t) (pages_id+ObjectsPerImage+1);
if (image_info->adjoin != MagickFalse)
{
Image
kid_image=image;
for ( ; GetNextImageInList(kid_image) != (Image *) NULL; count+=ObjectsPerImage)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%ld 0 R ",count);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 R ",(double)
+ count);
(void) WriteBlobString(image,buffer);
kid_image=GetNextImageInList(kid_image);
}
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
}
(void) WriteBlobString(image,"]\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Count %lu\n",
- (count-pages_id)/ObjectsPerImage);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Count %.20g\n",
+ (double) ((count-pages_id)/ObjectsPerImage));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"endobj\n");
}
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,"PDF") == 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);
/*
Write Page object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Type /Page\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Parent %lu 0 R\n",
- pages_id);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Parent %.20g 0 R\n",
+ (double) pages_id);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Resources <<\n");
labels=(char **) NULL;
if (labels != (char **) NULL)
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "/Font << /F%lu %lu 0 R >>\n",image->scene,object+4);
+ "/Font << /F%.20g %.20g 0 R >>\n",(double) image->scene,(double)
+ object+4);
(void) WriteBlobString(image,buffer);
}
(void) FormatMagickString(buffer,MaxTextExtent,
- "/XObject << /Im%lu %lu 0 R >>\n",image->scene,object+5);
+ "/XObject << /Im%.20g %.20g 0 R >>\n",(double) image->scene,(double)
+ object+5);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ProcSet %lu 0 R >>\n",
- object+3);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/ProcSet %.20g 0 R >>\n",
+ (double) object+3);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/MediaBox [0 0 %g %g]\n",
- 72.0*media_info.width/resolution.x,72.0*media_info.height/resolution.y);
+ (void) FormatMagickString(buffer,MaxTextExtent,
+ "/MediaBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x,
+ 72.0*media_info.height/resolution.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/CropBox [0 0 %g %g]\n",
- 72.0*media_info.width/resolution.x,72.0*media_info.height/resolution.y);
+ (void) FormatMagickString(buffer,MaxTextExtent,
+ "/CropBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x,
+ 72.0*media_info.height/resolution.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Contents %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Contents %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Thumb %lu 0 R\n",
- object+8);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Thumb %.20g 0 R\n",
+ (double) object+8);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"endobj\n");
Write Contents object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"stream\n");
for (i=0; labels[i] != (char *) NULL; i++)
{
(void) WriteBlobString(image,"BT\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/F%lu %g Tf\n",
- image->scene,pointsize);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/F%.20g %g Tf\n",
+ (double) image->scene,pointsize);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld Td\n",
- geometry.x,(long) (geometry.y+geometry.height+i*pointsize+12));
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g Td\n",
+ (double) geometry.x,(double) (geometry.y+geometry.height+i*pointsize+
+ 12));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"(%s) Tj\n",labels[i]);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"ET\n");
labels[i]=DestroyString(labels[i]);
}
- (void) FormatMagickString(buffer,MaxTextExtent,"%g 0 0 %g %ld %ld cm\n",
- scale.x,scale.y,geometry.x,geometry.y);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%g 0 0 %g %.20g %.20g cm\n",
+ scale.x,scale.y,(double) geometry.x,(double) geometry.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Im%lu Do\n",image->scene);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Im%.20g Do\n",
+ (double) image->scene);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"Q\n");
offset=TellBlob(image)-offset;
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",
- (unsigned long) offset);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
/*
Write Procset object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",
+ (double) object);
(void) WriteBlobString(image,buffer);
if ((image->storage_class == DirectClass) || (image->colors > 256))
(void) CopyMagickString(buffer,"[ /PDF /Text /ImageC",MaxTextExtent);
Write Font object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",
+ (double) object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
if (labels != (char **) NULL)
{
(void) WriteBlobString(image,"/Type /Font\n");
(void) WriteBlobString(image,"/Subtype /Type1\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Name /F%lu\n",
- image->scene);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Name /F%.20g\n",
+ (double) image->scene);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/BaseFont /Helvetica\n");
(void) WriteBlobString(image,"/Encoding /MacRomanEncoding\n");
Write XObject object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Type /XObject\n");
(void) WriteBlobString(image,"/Subtype /Image\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Im%lu\n",
- image->scene);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Im%.20g\n",
+ (double) image->scene);
(void) WriteBlobString(image,buffer);
switch (compression)
{
MaxTextExtent);
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << "
- "/K %s /BlackIs1 true /Columns %ld /Rows %ld >> ]\n",CCITTParam,
- image->columns,image->rows);
+ "/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam,
+ (double) image->columns,(double) image->rows);
break;
}
default:
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Width %lu\n",
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n",image->rows);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
+ image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %lu 0 R\n",
- object+2);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
+ (double) object+2);
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression) ?
(void) WriteBlobString(image,buffer);
if (image->matte != MagickFalse)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"/SMask %lu 0 R\n",
- object+7);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/SMask %.20g 0 R\n",
+ (double) object+7);
(void) WriteBlobString(image,buffer);
}
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"stream\n");
Dump Runlength encoded pixels.
*/
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;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
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;
}
Dump uncompressed PseudoColor packets.
*/
Ascii85Initialize(image);
- 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;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
Ascii85Encode(image,
ScaleQuantumToChar(PixelIntensityToQuantum(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;
}
Dump runoffset encoded pixels.
*/
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++)
+ 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));
if (image->colorspace == CMYKColorspace)
*q++=ScaleQuantumToChar(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;
}
Dump uncompressed DirectColor packets.
*/
Ascii85Initialize(image);
- 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++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- Ascii85Encode(image,ScaleQuantumToChar(p->red));
- Ascii85Encode(image,ScaleQuantumToChar(p->green));
- Ascii85Encode(image,ScaleQuantumToChar(p->blue));
+ Ascii85Encode(image,ScaleQuantumToChar(GetRedPixelComponent(p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetGreenPixelComponent(p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetBluePixelComponent(p)));
if (image->colorspace == CMYKColorspace)
Ascii85Encode(image,ScaleQuantumToChar(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;
}
Dump Runlength encoded pixels.
*/
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++)
+ for (x=0; x < (ssize_t) image->columns; x++)
*q++=(unsigned char) 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;
}
Dump uncompressed PseudoColor packets.
*/
Ascii85Initialize(image);
- 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++)
+ for (x=0; x < (ssize_t) image->columns; x++)
Ascii85Encode(image,(unsigned char) 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;
}
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",
- (unsigned long) offset);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",
+ (double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
/*
Write Colorspace object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
if (image->colorspace == CMYKColorspace)
(void) CopyMagickString(buffer,"/DeviceCMYK\n",MaxTextExtent);
(void) CopyMagickString(buffer,"/DeviceRGB\n",MaxTextExtent);
else
(void) FormatMagickString(buffer,MaxTextExtent,
- "[ /Indexed /DeviceRGB %lu %lu 0 R ]\n",
- image->colors-1,object+3);
+ "[ /Indexed /DeviceRGB %.20g %.20g 0 R ]\n",(double) image->colors-
+ 1,(double) object+3);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
/*
if (tile_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,image->exception.reason);
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
switch (compression)
MaxTextExtent);
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << "
- "/K %s /BlackIs1 true /Columns %lu /Rows %lu >> ]\n",CCITTParam,
- tile_image->columns,tile_image->rows);
+ "/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam,
+ (double) tile_image->columns,(double) tile_image->rows);
break;
}
default:
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Width %lu\n",
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
tile_image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n",
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
tile_image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %lu 0 R\n",
- object-1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
+ (double) object-1);
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression) ?
1 : 8);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"stream\n");
Dump Runlength encoded pixels.
*/
q=pixels;
- for (y=0; y < (long) tile_image->rows; y++)
+ for (y=0; y < (ssize_t) tile_image->rows; y++)
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
if (p == (const PixelPacket *) NULL)
break;
- for (x=0; x < (long) tile_image->columns; x++)
+ for (x=0; x < (ssize_t) tile_image->columns; x++)
{
*q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
p++;
Dump uncompressed PseudoColor packets.
*/
Ascii85Initialize(image);
- for (y=0; y < (long) tile_image->rows; y++)
+ for (y=0; y < (ssize_t) tile_image->rows; y++)
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
if (p == (const PixelPacket *) NULL)
break;
- for (x=0; x < (long) tile_image->columns; x++)
+ for (x=0; x < (ssize_t) tile_image->columns; x++)
{
Ascii85Encode(image,
ScaleQuantumToChar(PixelIntensityToQuantum(p)));
Dump runoffset encoded pixels.
*/
q=pixels;
- for (y=0; y < (long) tile_image->rows; y++)
+ for (y=0; y < (ssize_t) tile_image->rows; y++)
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(tile_image);
- for (x=0; x < (long) tile_image->columns; x++)
+ for (x=0; x < (ssize_t) tile_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));
if (image->colorspace == CMYKColorspace)
*q++=ScaleQuantumToChar(indexes[x]);
p++;
Dump uncompressed DirectColor packets.
*/
Ascii85Initialize(image);
- for (y=0; y < (long) tile_image->rows; y++)
+ for (y=0; y < (ssize_t) tile_image->rows; y++)
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(tile_image);
- for (x=0; x < (long) tile_image->columns; x++)
+ for (x=0; x < (ssize_t) tile_image->columns; x++)
{
- Ascii85Encode(image,ScaleQuantumToChar(p->red));
- Ascii85Encode(image,ScaleQuantumToChar(p->green));
- Ascii85Encode(image,ScaleQuantumToChar(p->blue));
+ Ascii85Encode(image,ScaleQuantumToChar(GetRedPixelComponent(p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetGreenPixelComponent(p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetBluePixelComponent(p)));
if (image->colorspace == CMYKColorspace)
Ascii85Encode(image,ScaleQuantumToChar(indexes[x]));
p++;
Dump Runlength encoded pixels.
*/
q=pixels;
- for (y=0; y < (long) tile_image->rows; y++)
+ for (y=0; y < (ssize_t) tile_image->rows; y++)
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(tile_image);
- for (x=0; x < (long) tile_image->columns; x++)
+ for (x=0; x < (ssize_t) tile_image->columns; x++)
*q++=(unsigned char) indexes[x];
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
Dump uncompressed PseudoColor packets.
*/
Ascii85Initialize(image);
- for (y=0; y < (long) tile_image->rows; y++)
+ for (y=0; y < (ssize_t) tile_image->rows; y++)
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(tile_image);
- for (x=0; x < (long) tile_image->columns; x++)
+ for (x=0; x < (ssize_t) tile_image->columns; x++)
Ascii85Encode(image,(unsigned char) indexes[x]);
}
Ascii85Flush(image);
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",
- (unsigned long) offset);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
if ((image->storage_class != DirectClass) && (image->colors <= 256) &&
(compression != FaxCompression) && (compression != Group4Compression))
(void) WriteBlobString(image,"<<\n");
if (compression == NoCompression)
(void) WriteBlobString(image,"/Filter [ /ASCII85Decode ]\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"stream\n");
offset=TellBlob(image);
if (compression == NoCompression)
Ascii85Initialize(image);
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
if (compression == NoCompression)
{
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",
- (unsigned long) offset);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
/*
Write softmask object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
if (image->matte == MagickFalse)
{
(void) WriteBlobString(image,"/Type /XObject\n");
(void) WriteBlobString(image,"/Subtype /Image\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Ma%lu\n",
- image->scene);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Ma%.20g\n",
+ (double) image->scene);
(void) WriteBlobString(image,buffer);
switch (compression)
{
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Width %lu\n",
- image->columns);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Width %.20g\n",
+ (double) image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n",
- image->rows);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Height %.20g\n",
+ (double) image->rows);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/ColorSpace /DeviceGray\n");
(void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression)
? 1 : 8);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n",
- object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"stream\n");
Dump Runlength encoded pixels.
*/
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;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar((Quantum) (QuantumRange-p->opacity));
+ *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
p++;
}
}
Dump uncompressed PseudoColor packets.
*/
Ascii85Initialize(image);
- 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;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
Ascii85Encode(image,ScaleQuantumToChar((Quantum) (QuantumRange-
- p->opacity)));
+ GetOpacityPixelComponent(p))));
p++;
}
}
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long)
- offset);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
if (GetNextImageInList(image) == (Image *) NULL)
*/
xref[object++]=TellBlob(image);
info_id=object;
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) FormatMagickString(buffer,MaxTextExtent,"/Title (%s)\n",
(void) FormatMagickString(buffer,MaxTextExtent,"/ModDate (%s)\n",date);
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"/Producer (%s)\n",
- EscapeParenthesis(GetMagickVersion((unsigned long *) NULL)));
+ EscapeParenthesis(GetMagickVersion((size_t *) NULL)));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"endobj\n");
*/
offset=TellBlob(image)-xref[0]+10;
(void) WriteBlobString(image,"xref\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"0 %lu\n",object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"0 %.20g\n",(double)
+ object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"0000000000 65535 f \n");
- for (i=0; i < (long) object; i++)
+ for (i=0; i < (ssize_t) object; i++)
{
(void) FormatMagickString(buffer,MaxTextExtent,"%010lu 00000 n \n",
(unsigned long) xref[i]);
}
(void) WriteBlobString(image,"trailer\n");
(void) WriteBlobString(image,"<<\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Size %lu\n",object+1);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Size %.20g\n",(double)
+ object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Info %lu 0 R\n",info_id);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Info %.20g 0 R\n",(double)
+ info_id);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Root %lu 0 R\n",root_id);
+ (void) FormatMagickString(buffer,MaxTextExtent,"/Root %.20g 0 R\n",(double)
+ root_id);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"startxref\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",
- (unsigned long) offset);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%EOF\n");
xref=(MagickOffsetType *) RelinquishMagickMemory(xref);
projects / imagemagick / blobdiff