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
}
l,
value;
- register long
+ register ssize_t
i;
l=0;
c&=0xff;
if (isxdigit(c) == MagickFalse)
continue;
- value=(int) ((unsigned long) value << 4)+hex_digits[c];
+ value=(int) ((size_t) value << 4)+hex_digits[c];
i++;
}
return(value);
#define EndXMPPacket "<?xpacket end="
#define ICCProfile "BeginICCProfile:"
#define CMYKCustomColor "CMYKCustomColor:"
+#define CMYKProcessColor "CMYKProcessColor:"
#define DocumentMedia "DocumentMedia:"
#define DocumentCustomColors "DocumentCustomColors:"
#define DocumentProcessColors "DocumentProcessColors:"
geometry[MaxTextExtent],
input_filename[MaxTextExtent],
options[MaxTextExtent],
- postscript_filename[MaxTextExtent],
- translate_geometry[MaxTextExtent];
+ postscript_filename[MaxTextExtent];
const char
*option;
register char
*p;
- register long
+ register ssize_t
i;
SegmentInfo
(void) sscanf(command,LanguageLevel " %lu",&language_level);
if (LocaleNCompare(Pages,command,strlen(Pages)) == 0)
(void) sscanf(command,Pages " %lu",&pages);
- if (LocaleNCompare(ImageData,command,strlen(Pages)) == 0)
+ if (LocaleNCompare(ImageData,command,strlen(ImageData)) == 0)
(void) sscanf(command,ImageData " %lu %lu",&columns,&rows);
- if (LocaleNCompare(ICCProfile,command,strlen(PhotoshopProfile)) == 0)
+ if (LocaleNCompare(ICCProfile,command,strlen(ICCProfile)) == 0)
{
unsigned char
*datum;
length=extent;
profile=AcquireStringInfo(length);
p=GetStringInfoDatum(profile);
- for (i=0; i < (long) length; i++)
+ for (i=0; i < (ssize_t) length; i++)
*p++=(unsigned char) ProfileInteger(image,hex_digits);
(void) SetImageProfile(image,"8bim",profile);
profile=DestroyStringInfo(profile);
}
if (LocaleNCompare(CMYKCustomColor,command,strlen(CMYKCustomColor)) == 0)
cmyk=MagickTrue;
+ if (LocaleNCompare(CMYKProcessColor,command,strlen(CMYKProcessColor)) == 0)
+ cmyk=MagickTrue;
length=strlen(DocumentCustomColors);
if ((LocaleNCompare(DocumentCustomColors,command,length) == 0) ||
(LocaleNCompare(CMYKCustomColor,command,strlen(CMYKCustomColor)) == 0) ||
/*
Note spot names.
*/
- (void) FormatMagickString(property,MaxTextExtent,"ps:SpotColor-%lu",
- spotcolor++);
+ (void) FormatMagickString(property,MaxTextExtent,"ps:SpotColor-%.20g",
+ (double) (spotcolor++));
for (p=command; *p != '\0'; p++)
if (isspace((int) (unsigned char) *p) != 0)
break;
Set Postscript render geometry.
*/
(void) FormatMagickString(geometry,MaxTextExtent,
- "%.15gx%.15g%+.15g%+.15g",bounds.x2-bounds.x1,bounds.y2-bounds.y1,
+ "%gx%g%+.15g%+.15g",bounds.x2-bounds.x1,bounds.y2-bounds.y1,
bounds.x1,bounds.y1);
(void) SetImageProperty(image,"ps: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;
}
}
"dup wcheck {3 1 roll put} {pop def} ifelse} {def} ifelse\n"
"<</UseCIEColor true>>setpagedevice\n",MaxTextExtent);
count=write(file,command,(unsigned int) strlen(command));
- (void) FormatMagickString(translate_geometry,MaxTextExtent,
- "%.15g %.15g translate\n",-bounds.x1,-bounds.y1);
- count=write(file,translate_geometry,strlen(translate_geometry));
+ if (image_info->page == (char *) NULL)
+ {
+ char
+ translate_geometry[MaxTextExtent];
+
+ (void) FormatMagickString(translate_geometry,MaxTextExtent,
+ "%g %g translate\n",-bounds.x1,-bounds.y1);
+ count=write(file,translate_geometry,(unsigned int)
+ strlen(translate_geometry));
+ }
file=close(file)-1;
/*
Render Postscript with the Ghostscript delegate.
*options='\0';
if ((page.width == 0) || (page.height == 0))
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
+ 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);
- (void) FormatMagickString(density,MaxTextExtent,"%.15gx%.15g",
- image->x_resolution,image->y_resolution);
- 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);
read_info=CloneImageInfo(image_info);
*read_info->magick='\0';
if (read_info->number_scenes != 0)
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(postscript_image,1,1,MagickTrue,exception);
if (clone_image != (Image *) NULL)
%
% The format of the RegisterPSImage method is:
%
-% unsigned long RegisterPSImage(void)
+% size_t RegisterPSImage(void)
%
*/
-ModuleExport unsigned long RegisterPSImage(void)
+ModuleExport size_t RegisterPSImage(void)
{
MagickInfo
*entry;
}
static inline unsigned char *PopHexPixel(const char **hex_digits,
- const unsigned long pixel,unsigned char *pixels)
+ const size_t pixel,unsigned char *pixels)
{
register const char
*hex;
q=PopHexPixel(hex_digits,ScaleQuantumToChar(pixel.green),q); \
q=PopHexPixel(hex_digits,ScaleQuantumToChar(pixel.blue),q); \
} \
- q=PopHexPixel(hex_digits,(const unsigned long) MagickMin(length,0xff),q); \
+ q=PopHexPixel(hex_digits,(const size_t) MagickMin(length,0xff),q); \
}
static const char
IndexPacket
index;
- long
+ ssize_t
j,
y;
register const PixelPacket
*p;
- register long
+ register ssize_t
i,
x;
unsigned char
pixels[2048];
- unsigned long
+ size_t
bit,
byte,
page,
}
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);
if (page == 1)
{
/*
else
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%BoundingBox: %ld %ld %ld %ld\n",(long) (bounds.x1+0.5),
- (long) (bounds.y1+0.5),(long) (bounds.x2+0.5),
- (long) (bounds.y2+0.5));
+ "%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5),
+ ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%HiResBoundingBox: %.15g %.15g %.15g %.15g\n",bounds.x1,
+ "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
}
(void) WriteBlobString(image,buffer);
Embed Photoshop profile.
*/
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%BeginPhotoshop: %lu",(unsigned long) GetStringInfoLength(
- profile));
+ "%%BeginPhotoshop: %.20g",(double) GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
- for (i=0; i < (long) GetStringInfoLength(profile); i++)
+ for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++)
{
if ((i % 32) == 0)
(void) WriteBlobString(image,"\n% ");
(void) WriteBlobString(image,"\n%EndPhotoshop\n");
}
profile=GetImageProfile(image,"xmp");
- if (profile != (StringInfo *) NULL)
+ if (0 && (profile != (StringInfo *) NULL))
{
/*
Embed XML profile.
*/
(void) WriteBlobString(image,"\n%begin_xml_code\n");
- for (i=0; i < (long) GetStringInfoLength(profile); i++)
+ (void) FormatMagickString(buffer,MaxTextExtent,
+ "\n%%begin_xml_packet: %.20g\n",(double)
+ GetStringInfoLength(profile));
+ (void) WriteBlobString(image,buffer);
+ for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++)
(void) WriteBlobByte(image,GetStringInfoDatum(profile)[i]);
- (void) WriteBlobString(image,"\n%end_xml_code\n");
+ (void) WriteBlobString(image,"\n%end_xml_packet\n%end_xml_code\n");
}
value=GetImageProperty(image,"label");
if (value != (const char *) NULL)
*/
(void) WriteBlobString(image,"%%Orientation: Portrait\n");
(void) WriteBlobString(image,"%%PageOrder: Ascend\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Pages: %lu\n",
- image_info->adjoin != MagickFalse ? (unsigned long)
- GetImageListLength(image) : 1UL);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Pages: %.20g\n",
+ image_info->adjoin != MagickFalse ? (double)
+ GetImageListLength(image) : 1.0);
(void) WriteBlobString(image,buffer);
}
(void) WriteBlobString(image,"%%EndComments\n");
Image
*preview_image;
- long
+ ssize_t
y;
Quantum
pixel;
- register long
+ register ssize_t
x;
/*
Dump image as bitmap.
*/
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%BeginPreview: %lu %lu %lu %lu\n%% ",preview_image->columns,
- preview_image->rows,1L,(((preview_image->columns+7) >> 3)*
- preview_image->rows+35)/36);
+ "%%%%BeginPreview: %.20g %.20g %.20g %.20g\n%% ",(double)
+ preview_image->columns,(double) preview_image->rows,1.0,
+ (double) ((((preview_image->columns+7) >> 3)*preview_image->rows+
+ 35)/36));
(void) WriteBlobString(image,buffer);
q=pixels;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(preview_image,0,y,preview_image->columns,1,
&preview_image->exception);
indexes=GetVirtualIndexQueue(preview_image);
bit=0;
byte=0;
- for (x=0; x < (long) preview_image->columns; x++)
+ for (x=0; x < (ssize_t) preview_image->columns; x++)
{
byte<<=1;
pixel=PixelIntensityToQuantum(p);
}
value=GetImageProperty(image,"label");
if (value != (const char *) NULL)
- for (j=(long) MultilineCensus(value)-1; j >= 0; j--)
+ for (j=(ssize_t) MultilineCensus(value)-1; j >= 0; j--)
{
(void) WriteBlobString(image," /label 512 string def\n");
(void) WriteBlobString(image," currentfile label readline pop\n");
(void) FormatMagickString(buffer,MaxTextExtent,
- " 0 y %.15g add moveto label show pop\n",j*pointsize+12);
+ " 0 y %g add moveto label show pop\n",j*pointsize+12);
(void) WriteBlobString(image,buffer);
}
for (s=PostscriptEpilog; *s != (char *) NULL; s++)
(void) WriteBlobString(image,"} bind def\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);
(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);
if ((double) geometry.x < bounds.x1)
bounds.x1=(double) geometry.x;
/*
Output image data.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
- "%ld %ld\n%.15g %.15g\n%.15g\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);
labels=(char **) NULL;
value=GetImageProperty(image,"label");
Dump image as grayscale.
*/
(void) FormatMagickString(buffer,MaxTextExtent,
- "%lu %lu\n1\n1\n1\n8\n",image->columns,image->rows);
+ "%.20g %.20g\n1\n1\n1\n8\n",(double) image->columns,(double)
+ image->rows);
(void) WriteBlobString(image,buffer);
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++)
{
pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
q=PopHexPixel(hex_digits,pixel,q);
}
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
}
else
{
- long
+ ssize_t
y;
Quantum
Dump image as bitmap.
*/
(void) FormatMagickString(buffer,MaxTextExtent,
- "%lu %lu\n1\n1\n1\n1\n",image->columns,image->rows);
+ "%.20g %.20g\n1\n1\n1\n1\n",(double) image->columns,(double)
+ image->rows);
(void) WriteBlobString(image,buffer);
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);
indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
pixel=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 DirectClass image.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n0\n%d\n",
- image->columns,image->rows,
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
+ (double) image->columns,(double) image->rows,
image_info->compression == RLECompression ? 1 : 0);
(void) WriteBlobString(image,buffer);
switch (image_info->compression)
Dump runlength-encoded DirectColor packets.
*/
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);
break;
pixel=(*p);
length=255;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
if ((p->red == pixel.red) && (p->green == pixel.green) &&
(p->blue == pixel.blue) &&
(p->opacity == pixel.opacity) && (length < 255) &&
- (x < (long) (image->columns-1)))
+ (x < (ssize_t) (image->columns-1)))
length++;
else
{
}
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.
*/
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++)
{
if ((image->matte != MagickFalse) &&
(p->opacity == (Quantum) TransparentOpacity))
}
else
{
- q=PopHexPixel(hex_digits,ScaleQuantumToChar(p->red),q);
- q=PopHexPixel(hex_digits,ScaleQuantumToChar(p->green),q);
- q=PopHexPixel(hex_digits,ScaleQuantumToChar(p->blue),q);
+ q=PopHexPixel(hex_digits,ScaleQuantumToChar(GetRedPixelComponent(p)),q);
+ q=PopHexPixel(hex_digits,ScaleQuantumToChar(GetGreenPixelComponent(p)),q);
+ q=PopHexPixel(hex_digits,ScaleQuantumToChar(GetBluePixelComponent(p)),q);
}
if ((q-pixels+6) >= 80)
{
}
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 PseudoClass image.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n%d\n%d\n0\n",
- image->columns,image->rows,
- image->storage_class == PseudoClass ? 1 : 0,
+ (void) FormatMagickString(buffer,MaxTextExtent,
+ "%.20g %.20g\n%d\n%d\n0\n",(double) image->columns,(double)
+ image->rows,image->storage_class == PseudoClass ? 1 : 0,
image_info->compression == RLECompression ? 1 : 0);
(void) WriteBlobString(image,buffer);
/*
Dump number of colors and colormap.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",image->colors);
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ image->colors);
(void) WriteBlobString(image,buffer);
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
(void) FormatMagickString(buffer,MaxTextExtent,"%02X%02X%02X\n",
ScaleQuantumToChar(image->colormap[i].red),
Dump runlength-encoded PseudoColor packets.
*/
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);
indexes=GetVirtualIndexQueue(image);
index=(*indexes);
length=255;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
if ((index == indexes[x]) && (length < 255) &&
- (x < ((long) image->columns-1)))
+ (x < ((ssize_t) image->columns-1)))
length++;
else
{
if (x > 0)
{
q=PopHexPixel(hex_digits,index,q);
- q=PopHexPixel(hex_digits,(unsigned long)
+ q=PopHexPixel(hex_digits,(size_t)
MagickMin(length,0xff),q);
i++;
if ((q-pixels+6) >= 80)
p++;
}
q=PopHexPixel(hex_digits,index,q);
- q=PopHexPixel(hex_digits,(unsigned long)
+ q=PopHexPixel(hex_digits,(size_t)
MagickMin(length,0xff),q);
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.
*/
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=PopHexPixel(hex_digits,indexes[x],q);
if ((q-pixels+4) >= 80)
}
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
if (page > 2)
{
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%BoundingBox: %ld %ld %ld %ld\n",(long) (bounds.x1+0.5),
- (long) (bounds.y1+0.5),(long) (bounds.x2+0.5),(long) (bounds.y2+0.5));
+ "%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5),
+ ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,
- "%%%%HiResBoundingBox: %.15g %.15g %.15g %.15g\n",bounds.x1,bounds.y1,
+ "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,
bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
}
projects / imagemagick / blobdiff