%
% The format of the RegisterPS2Image method is:
%
-% unsigned long RegisterPS2Image(void)
+% size_t RegisterPS2Image(void)
%
*/
-ModuleExport unsigned long RegisterPS2Image(void)
+ModuleExport size_t RegisterPS2Image(void)
{
MagickInfo
*entry;
GeometryInfo
geometry_info;
- long
+ ssize_t
j,
y;
register const PixelPacket
*p;
- register long
+ register ssize_t
x;
- register long
+ register ssize_t
i;
SegmentInfo
unsigned char
*pixels;
- unsigned long
+ size_t
page,
text_size;
}
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);
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");
}
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 (q=PostscriptEpilog; *q; q++)
(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)
+ "%%%%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)
/*
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");
((image_info->type != TrueColorType) &&
(IsGrayImage(image,&image->exception) != MagickFalse)))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n1\n%d\n",
- image->columns,image->rows,(int)
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
+ (double) image->columns,(double) image->rows,(int)
(image->colorspace == CMYKColorspace));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"%d\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++;
}
- progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+ progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
if (progress == 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)));
p++;
}
- progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+ progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
+ y,image->rows);
if (progress == MagickFalse)
break;
}
if ((image->storage_class == DirectClass) || (image->colors > 256) ||
(compression == JPEGCompression) || (image->matte != MagickFalse))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n0\n%d\n",
- image->columns,image->rows,(int)
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
+ (double) image->columns,(double) image->rows,(int)
(image->colorspace == CMYKColorspace));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"%d\n",
Dump Packbit 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++)
{
if ((image->matte != MagickFalse) &&
(p->opacity == (Quantum) TransparentOpacity))
else
if (image->colorspace != CMYKColorspace)
{
- *q++=ScaleQuantumToChar(p->red);
- *q++=ScaleQuantumToChar(p->green);
- *q++=ScaleQuantumToChar(p->blue);
+ *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
}
else
{
- *q++=ScaleQuantumToChar(p->red);
- *q++=ScaleQuantumToChar(p->green);
- *q++=ScaleQuantumToChar(p->blue);
+ *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
*q++=ScaleQuantumToChar(indexes[x]);
}
p++;
}
- progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+ progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
if (progress == 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++)
{
if ((image->matte != MagickFalse) &&
(p->opacity == (Quantum) TransparentOpacity))
else
if (image->colorspace != CMYKColorspace)
{
- 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)));
}
else
{
- 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)));
Ascii85Encode(image,ScaleQuantumToChar(indexes[x]));
}
p++;
}
- progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+ progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
if (progress == MagickFalse)
break;
}
/*
Dump number of colors and colormap.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n1\n%d\n",
- image->columns,image->rows,(int)
+ (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
+ (double) image->columns,(double) image->rows,(int)
(image->colorspace == CMYKColorspace));
(void) WriteBlobString(image,buffer);
(void) FormatMagickString(buffer,MaxTextExtent,"%d\n",
(int) (compression == NoCompression));
(void) WriteBlobString(image,buffer);
- (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 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];
- progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+ progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
if (progress == 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]);
- progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+ progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
if (progress == MagickFalse)
break;
}
if (page > 1)
{
(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