diff --git a/coders/braille.c b/coders/braille.c
index 91afa1e..7976d27 100644
--- a/coders/braille.c
+++ b/coders/braille.c
@@ -224,25 +224,25 @@
value=GetImageProperty(image,"label");
if (value != (const char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"Title: %s\n", value);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"Title: %s\n", value);
(void) WriteBlobString(image,buffer);
}
if (image->page.x != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"X: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"X: %.20g\n",(double)
image->page.x);
(void) WriteBlobString(image,buffer);
}
if (image->page.y != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"Y: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"Y: %.20g\n",(double)
image->page.y);
(void) WriteBlobString(image,buffer);
}
- (void) FormatMagickString(buffer,MaxTextExtent,"Width: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"Width: %.20g\n",(double)
(image->columns+(image->columns % 2)));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"Height: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"Height: %.20g\n",(double)
image->rows);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"\n");
diff --git a/coders/cals.c b/coders/cals.c
index bba5409..2801b1c 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -262,11 +262,11 @@
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"group4:%s",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"group4:%s",
filename);
- (void) FormatMagickString(message,MaxTextExtent,"%lux%lu",width,height);
+ (void) FormatLocaleString(message,MaxTextExtent,"%lux%lu",width,height);
read_info->size=ConstantString(message);
- (void) FormatMagickString(message,MaxTextExtent,"%lu",density);
+ (void) FormatLocaleString(message,MaxTextExtent,"%lu",density);
read_info->density=ConstantString(message);
read_info->orientation=(OrientationType) orientation;
image=ReadImage(read_info,exception);
@@ -530,10 +530,10 @@
orient_y=270;
}
}
- (void) FormatMagickString(header,MaxTextExtent,"rorient: %03ld,%03ld",
+ (void) FormatLocaleString(header,MaxTextExtent,"rorient: %03ld,%03ld",
(long) orient_x,(long) orient_y);
count=WriteCALSRecord(image,header);
- (void) FormatMagickString(header,MaxTextExtent,"rpelcnt: %06lu,%06lu",
+ (void) FormatLocaleString(header,MaxTextExtent,"rpelcnt: %06lu,%06lu",
(unsigned long) image->columns,(unsigned long) image->rows);
count=WriteCALSRecord(image,header);
density=200;
@@ -545,7 +545,7 @@
(void) ParseGeometry(image_info->density,&geometry_info);
density=(size_t) floor(geometry_info.rho+0.5);
}
- (void) FormatMagickString(header,MaxTextExtent,"rdensty: %04lu",
+ (void) FormatLocaleString(header,MaxTextExtent,"rdensty: %04lu",
(unsigned long) density);
count=WriteCALSRecord(image,header);
count=WriteCALSRecord(image,"notes: NONE");
diff --git a/coders/caption.c b/coders/caption.c
index c8532d7..3d2280e 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -157,7 +157,7 @@
i=FormatMagickCaption(image,draw_info,MagickFalse,&metrics,&text);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatMagickString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -176,7 +176,7 @@
i=FormatMagickCaption(image,draw_info,MagickFalse,&metrics,&text);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatMagickString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -211,7 +211,7 @@
image->page.x=(ssize_t) (metrics.bounds.x1-draw_info->stroke_width/2.0);
else
{
- (void) FormatMagickString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.ascent+
draw_info->stroke_width/2.0);
(void) CloneString(&draw_info->geometry,geometry);
diff --git a/coders/cin.c b/coders/cin.c
index fd2d4bc..2d426fa 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -1057,12 +1057,12 @@
cin.origination.x_pitch=0.0f;
value=GetCINProperty(image_info,image,"dpx:origination.x_pitch");
if (value != (const char *) NULL)
- cin.origination.x_pitch=StringToDouble(value,(char **) NULL);
+ cin.origination.x_pitch=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,cin.origination.x_pitch);
cin.origination.y_pitch=0.0f;
value=GetCINProperty(image_info,image,"dpx:origination.y_pitch");
if (value != (const char *) NULL)
- cin.origination.y_pitch=StringToDouble(value,(char **) NULL);
+ cin.origination.y_pitch=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,cin.origination.y_pitch);
cin.origination.gamma=image->gamma;
offset+=WriteBlobFloat(image,cin.origination.gamma);
@@ -1110,7 +1110,7 @@
cin.film.frame_rate=0.0f;
value=GetCINProperty(image_info,image,"dpx:film.frame_rate");
if (value != (const char *) NULL)
- cin.film.frame_rate=StringToDouble(value,(char **) NULL);
+ cin.film.frame_rate=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,cin.film.frame_rate);
value=GetCINProperty(image_info,image,"dpx:film.frame_id");
if (value != (const char *) NULL)
diff --git a/coders/cip.c b/coders/cip.c
index 4f12719..142b958 100644
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -201,30 +201,30 @@
(void) WriteBlobString(image,"<CiscoIPPhoneImage>\n");
value=GetImageProperty(image,"label");
if (value != (const char *) NULL)
- (void) FormatMagickString(buffer,MaxTextExtent,"<Title>%s</Title>\n",value);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<Title>%s</Title>\n",value);
else
{
char
basename[MaxTextExtent];
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,"<Title>%s</Title>\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<Title>%s</Title>\n",
basename);
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"<LocationX>%.20g</LocationX>\n",(double) image->page.x);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"<LocationY>%.20g</LocationY>\n",(double) image->page.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"<Width>%.20g</Width>\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<Width>%.20g</Width>\n",
(double) (image->columns+(image->columns % 2)));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"<Height>%.20g</Height>\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<Height>%.20g</Height>\n",
(double) image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"<Depth>2</Depth>\n");
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<Depth>2</Depth>\n");
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<Data>");
if (image->colorspace != RGBColorspace)
@@ -241,7 +241,7 @@
(((size_t) (4*PixelIntensityToQuantum(p+2)/QuantumRange) & 0x03) << 4) |
(((size_t) (4*PixelIntensityToQuantum(p+1)/QuantumRange) & 0x03) << 2) |
(((size_t) (4*PixelIntensityToQuantum(p+0)/QuantumRange) & 0x03) << 0));
- (void) FormatMagickString(buffer,MaxTextExtent,"%02x",byte);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",byte);
(void) WriteBlobString(image,buffer);
p+=4;
}
@@ -253,7 +253,7 @@
(((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,2))/QuantumRange) & 0x03) << 4) |
(((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,1))/QuantumRange) & 0x03) << 2) |
(((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,0))/QuantumRange) & 0x03) << 0));
- (void) FormatMagickString(buffer,MaxTextExtent,"%02x",~byte);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",~byte);
(void) WriteBlobString(image,buffer);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/coders/clip.c b/coders/clip.c
index 8d8ae0d..632e90a 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -170,7 +170,7 @@
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,&image->exception);
if (LocaleCompare(write_info->magick,"CLIP") == 0)
- (void) FormatMagickString(clip_image->filename,MaxTextExtent,"miff:%s",
+ (void) FormatLocaleString(clip_image->filename,MaxTextExtent,"miff:%s",
write_info->filename);
status=WriteImage(write_info,clip_image);
clip_image=DestroyImage(clip_image);
diff --git a/coders/dcm.c b/coders/dcm.c
index 9efaf9b..906d818 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3025,17 +3025,17 @@
if ((group == (ssize_t) dicom_info[i].group) &&
(element == (ssize_t) dicom_info[i].element))
break;
- (void) fprintf(stdout,"0x%04lX %4ld %s-%s (0x%04lx,0x%04lx)",
+ (void) FormatLocaleFile(stdout,"0x%04lX %4ld %s-%s (0x%04lx,0x%04lx)",
(unsigned long) image->offset,(long) length,implicit_vr,
explicit_vr,(unsigned long) group,(unsigned long) element);
if (dicom_info[i].description != (char *) NULL)
- (void) fprintf(stdout," %s",dicom_info[i].description);
- (void) fprintf(stdout,": ");
+ (void) FormatLocaleFile(stdout," %s",dicom_info[i].description);
+ (void) FormatLocaleFile(stdout,": ");
}
if ((group == 0x7FE0) && (element == 0x0010))
{
if (image_info->verbose != MagickFalse)
- (void) fprintf(stdout,"\n");
+ (void) FormatLocaleFile(stdout,"\n");
break;
}
/*
@@ -3063,7 +3063,7 @@
count=ReadBlob(image,(size_t) quantum*length,data);
if (count != (ssize_t) (quantum*length))
{
- (void) fprintf(stdout,"count=%d quantum=%d length=%d "
+ (void) FormatLocaleFile(stdout,"count=%d quantum=%d length=%d "
"group=%d\n",(int) count,(int) quantum,(int) length,(int)
group);
ThrowReaderException(CorruptImageError,
@@ -3092,7 +3092,7 @@
group=0;
element=0;
if (image_info->verbose != MagickFalse)
- (void) fprintf(stdout,
+ (void) FormatLocaleFile(stdout,
"Corrupted image - trying explicit format\n");
break;
}
@@ -3101,7 +3101,7 @@
(void) CopyMagickString(transfer_syntax,(char *) data,
MaxTextExtent);
if (image_info->verbose != MagickFalse)
- (void) fprintf(stdout,"transfer_syntax=%s\n",(const char*)
+ (void) FormatLocaleFile(stdout,"transfer_syntax=%s\n",(const char*)
transfer_syntax);
if (strncmp(transfer_syntax,"1.2.840.10008.1.2",17) == 0)
{
@@ -3421,7 +3421,7 @@
if (image_info->verbose != MagickFalse)
{
if (data == (unsigned char *) NULL)
- (void) fprintf(stdout,"%d\n",datum);
+ (void) FormatLocaleFile(stdout,"%d\n",datum);
else
{
/*
@@ -3438,15 +3438,15 @@
datum=0;
for (j=(ssize_t) length-1; j >= 0; j--)
datum=(256*datum+data[j]);
- (void) fprintf(stdout,"%d",datum);
+ (void) FormatLocaleFile(stdout,"%d",datum);
}
else
for (i=0; i < (ssize_t) length; i++)
if (isprint((int) data[i]) != MagickFalse)
- (void) fprintf(stdout,"%c",data[i]);
+ (void) FormatLocaleFile(stdout,"%c",data[i]);
else
- (void) fprintf(stdout,"%c",'.');
- (void) fprintf(stdout,"\n");
+ (void) FormatLocaleFile(stdout,"%c",'.');
+ (void) FormatLocaleFile(stdout,"\n");
}
}
if (data != (unsigned char *) NULL)
@@ -3557,10 +3557,10 @@
(void) fputc(c,file);
}
(void) fclose(file);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,
"jpeg:%s",filename);
if (image->compression == JPEG2000Compression)
- (void) FormatMagickString(read_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,
"jp2:%s",filename);
jpeg_image=ReadImage(read_info,exception);
if (jpeg_image != (Image *) NULL)
diff --git a/coders/debug.c b/coders/debug.c
index 434d1c9..9fe5a3b 100644
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -211,7 +211,7 @@
image->depth=GetImageQuantumDepth(image,MagickTrue);
if (image->matte != MagickFalse)
(void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"# ImageMagick pixel debugging: %.20g,%.20g,%.20g,%s\n",(double)
image->columns,(double) image->rows,(double)
GetQuantumRange(image->depth),colorspace);
@@ -225,18 +225,18 @@
indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
SetMagickPixelPacket(image,p,indexes+x,&pixel);
- (void) FormatMagickString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ",
+ (void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
if (pixel.colorspace == CMYKColorspace)
{
char
black[MaxTextExtent];
- (void) FormatMagickString(black,MaxTextExtent,",%.20g ",
+ (void) FormatLocaleString(black,MaxTextExtent,",%.20g ",
(double) pixel.index);
(void) ConcatenateMagickString(tuple,black,MaxTextExtent);
}
@@ -245,7 +245,7 @@
char
alpha[MaxTextExtent];
- (void) FormatMagickString(alpha,MaxTextExtent,",%.20g ",
+ (void) FormatLocaleString(alpha,MaxTextExtent,",%.20g ",
(double) (QuantumRange-pixel.opacity));
(void) ConcatenateMagickString(tuple,alpha,MaxTextExtent);
}
diff --git a/coders/dng.c b/coders/dng.c
index a5664ba..8937a36 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -130,14 +130,14 @@
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) InvokeDelegate(read_info,image,"dng:decode",(char *) NULL,exception);
image=DestroyImage(image);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"%s.png",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.png",
read_info->unique);
sans_exception=AcquireExceptionInfo();
image=ReadImage(read_info,sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
if (image == (Image *) NULL)
{
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"%s.ppm",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.ppm",
read_info->unique);
image=ReadImage(read_info,exception);
}
@@ -152,7 +152,7 @@
*sans;
(void) CopyMagickString(image->magick,read_info->magick,MaxTextExtent);
- (void) FormatMagickString(filename,MaxTextExtent,"%s.ufraw",
+ (void) FormatLocaleString(filename,MaxTextExtent,"%s.ufraw",
read_info->unique);
sans=AcquireExceptionInfo();
xml=FileToString(filename,MaxTextExtent,sans);
@@ -188,7 +188,7 @@
tag=GetXMLTreeTag(next);
if (tag == (char *) NULL)
tag="unknown";
- (void) FormatMagickString(property,MaxTextExtent,"dng:%s",tag);
+ (void) FormatLocaleString(property,MaxTextExtent,"dng:%s",tag);
content=ConstantString(GetXMLTreeContent(next));
StripString(content);
if ((LocaleCompare(tag,"log") != 0) &&
diff --git a/coders/dot.c b/coders/dot.c
index 54c5e35..b978112 100644
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -133,7 +133,7 @@
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) CopyMagickString(read_info->magick,"SVG",MaxTextExtent);
(void) AcquireUniqueFilename(read_info->filename);
- (void) FormatMagickString(command,MaxTextExtent,"-Tsvg -o%s %s",
+ (void) FormatLocaleString(command,MaxTextExtent,"-Tsvg -o%s %s",
read_info->filename,image_info->filename);
graph=agread(GetBlobFileHandle(image));
if (graph == (graph_t *) NULL)
diff --git a/coders/dpx.c b/coders/dpx.c
index 9a41efd..38ec0af 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -527,7 +527,7 @@
shift=4*TimeFields;
for (i=0; i <= TimeFields; i++)
{
- (void) FormatMagickString(code,MaxTextExtent-strlen(code),"%x",
+ (void) FormatLocaleString(code,MaxTextExtent-strlen(code),"%x",
(unsigned int) ((timestamp >> shift) & 0x0fU));
code++;
if (((i % 2) != 0) && (i < TimeFields))
@@ -1532,12 +1532,12 @@
dpx.orientation.x_center=0.0f;
value=GetDPXProperty(image_info,image,"dpx:orientation.x_center");
if (value != (const char *) NULL)
- dpx.orientation.x_center=StringToDouble(value,(char **) NULL);
+ dpx.orientation.x_center=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.orientation.x_center);
dpx.orientation.y_center=0.0f;
value=GetDPXProperty(image_info,image,"dpx:orientation.y_center");
if (value != (const char *) NULL)
- dpx.orientation.y_center=StringToDouble(value,(char **) NULL);
+ dpx.orientation.y_center=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.orientation.y_center);
dpx.orientation.x_size=0U;
value=GetDPXProperty(image_info,image,"dpx:orientation.x_size");
@@ -1653,12 +1653,12 @@
dpx.film.frame_rate=0.0f;
value=GetDPXProperty(image_info,image,"dpx:film.frame_rate");
if (value != (const char *) NULL)
- dpx.film.frame_rate=StringToDouble(value,(char **) NULL);
+ dpx.film.frame_rate=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.film.frame_rate);
dpx.film.shutter_angle=0.0f;
value=GetDPXProperty(image_info,image,"dpx:film.shutter_angle");
if (value != (const char *) NULL)
- dpx.film.shutter_angle=StringToDouble(value,(char **) NULL);
+ dpx.film.shutter_angle=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.film.shutter_angle);
*dpx.film.frame_id='\0';
value=GetDPXProperty(image_info,image,"dpx:film.frame_id");
@@ -1706,52 +1706,52 @@
value=GetDPXProperty(image_info,image,
"dpx:television.horizontal_sample_rate");
if (value != (const char *) NULL)
- dpx.television.horizontal_sample_rate=StringToDouble(value,(char **) NULL);
+ dpx.television.horizontal_sample_rate=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.horizontal_sample_rate);
dpx.television.vertical_sample_rate=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.vertical_sample_rate");
if (value != (const char *) NULL)
- dpx.television.vertical_sample_rate=StringToDouble(value,(char **) NULL);
+ dpx.television.vertical_sample_rate=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.vertical_sample_rate);
dpx.television.frame_rate=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.frame_rate");
if (value != (const char *) NULL)
- dpx.television.frame_rate=StringToDouble(value,(char **) NULL);
+ dpx.television.frame_rate=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.frame_rate);
dpx.television.time_offset=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.time_offset");
if (value != (const char *) NULL)
- dpx.television.time_offset=StringToDouble(value,(char **) NULL);
+ dpx.television.time_offset=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.time_offset);
dpx.television.gamma=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.gamma");
if (value != (const char *) NULL)
- dpx.television.gamma=StringToDouble(value,(char **) NULL);
+ dpx.television.gamma=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.gamma);
dpx.television.black_level=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.black_level");
if (value != (const char *) NULL)
- dpx.television.black_level=StringToDouble(value,(char **) NULL);
+ dpx.television.black_level=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.black_level);
dpx.television.black_gain=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.black_gain");
if (value != (const char *) NULL)
- dpx.television.black_gain=StringToDouble(value,(char **) NULL);
+ dpx.television.black_gain=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.black_gain);
dpx.television.break_point=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.break_point");
if (value != (const char *) NULL)
- dpx.television.break_point=StringToDouble(value,(char **) NULL);
+ dpx.television.break_point=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.break_point);
dpx.television.white_level=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.white_level");
if (value != (const char *) NULL)
- dpx.television.white_level=StringToDouble(value,(char **) NULL);
+ dpx.television.white_level=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.white_level);
dpx.television.integration_times=0.0f;
value=GetDPXProperty(image_info,image,"dpx:television.integration_times");
if (value != (const char *) NULL)
- dpx.television.integration_times=StringToDouble(value,(char **) NULL);
+ dpx.television.integration_times=LocaleToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.integration_times);
offset+=WriteBlob(image,sizeof(dpx.television.reserve),(unsigned char *)
dpx.television.reserve);
diff --git a/coders/ept.c b/coders/ept.c
index 72e4003..572f38d 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -410,7 +410,7 @@
return(MagickFalse);
write_info=CloneImageInfo(image_info);
(void) CopyMagickString(write_info->magick,"TIFF",MaxTextExtent);
- (void) FormatMagickString(filename,MaxTextExtent,"tiff:%s",
+ (void) FormatLocaleString(filename,MaxTextExtent,"tiff:%s",
write_info->filename);
(void) CopyMagickString(write_info->filename,filename,MaxTextExtent);
(void) TransformImage(&write_image,(char *) NULL,"512x512>");
diff --git a/coders/fits.c b/coders/fits.c
index 294c2b2..4ea3a15 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -358,13 +358,13 @@
if (LocaleCompare(keyword,"naxis3") == 0)
fits_info.number_planes=StringToLong(p);
if (LocaleCompare(keyword,"datamax") == 0)
- fits_info.max_data=StringToDouble(p,(char **) NULL);
+ fits_info.max_data=LocaleToDouble(p,(char **) NULL);
if (LocaleCompare(keyword,"datamin") == 0)
- fits_info.min_data=StringToDouble(p,(char **) NULL);
+ fits_info.min_data=LocaleToDouble(p,(char **) NULL);
if (LocaleCompare(keyword,"bzero") == 0)
- fits_info.zero=StringToDouble(p,(char **) NULL);
+ fits_info.zero=LocaleToDouble(p,(char **) NULL);
if (LocaleCompare(keyword,"bscale") == 0)
- fits_info.scale=StringToDouble(p,(char **) NULL);
+ fits_info.scale=LocaleToDouble(p,(char **) NULL);
if (LocaleCompare(keyword,"comment") == 0)
{
if (comment == (char *) NULL)
@@ -379,7 +379,7 @@
else
fits_info.endian=LSBEndian;
}
- (void) FormatMagickString(property,MaxTextExtent,"fits:%s",keyword);
+ (void) FormatLocaleString(property,MaxTextExtent,"fits:%s",keyword);
(void) SetImageProperty(image,property,p);
}
c=0;
@@ -649,55 +649,55 @@
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
offset=0;
- (void) FormatMagickString(header,FITSBlocksize,
+ (void) FormatLocaleString(header,FITSBlocksize,
"SIMPLE = T");
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"BITPIX = %10ld",
+ (void) FormatLocaleString(header,FITSBlocksize,"BITPIX = %10ld",
(long) (quantum_info->format == FloatingPointQuantumFormat ? -1 : 1)*
image->depth);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"NAXIS = %10lu",
+ (void) FormatLocaleString(header,FITSBlocksize,"NAXIS = %10lu",
IsGrayImage(image,&image->exception) != MagickFalse ? 2UL : 3UL);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"NAXIS1 = %10lu",
+ (void) FormatLocaleString(header,FITSBlocksize,"NAXIS1 = %10lu",
(unsigned long) image->columns);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"NAXIS2 = %10lu",
+ (void) FormatLocaleString(header,FITSBlocksize,"NAXIS2 = %10lu",
(unsigned long) image->rows);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
if (IsGrayImage(image,&image->exception) == MagickFalse)
{
- (void) FormatMagickString(header,FITSBlocksize,
+ (void) FormatLocaleString(header,FITSBlocksize,
"NAXIS3 = %10lu",3UL);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
}
- (void) FormatMagickString(header,FITSBlocksize,"BSCALE = %E",1.0);
+ (void) FormatLocaleString(header,FITSBlocksize,"BSCALE = %E",1.0);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"BZERO = %E",
+ (void) FormatLocaleString(header,FITSBlocksize,"BZERO = %E",
image->depth > 8 ? GetFITSPixelRange(image->depth) : 0.0);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"DATAMAX = %E",
+ (void) FormatLocaleString(header,FITSBlocksize,"DATAMAX = %E",
1.0*((MagickOffsetType) GetQuantumRange(image->depth)));
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- (void) FormatMagickString(header,FITSBlocksize,"DATAMIN = %E",0.0);
+ (void) FormatLocaleString(header,FITSBlocksize,"DATAMIN = %E",0.0);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
if (image->endian == LSBEndian)
{
- (void) FormatMagickString(header,FITSBlocksize,"XENDIAN = 'SMALL'");
+ (void) FormatLocaleString(header,FITSBlocksize,"XENDIAN = 'SMALL'");
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
}
- (void) FormatMagickString(header,FITSBlocksize,"HISTORY %.72s",
+ (void) FormatLocaleString(header,FITSBlocksize,"HISTORY %.72s",
GetMagickVersion((size_t *) NULL));
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
diff --git a/coders/gif.c b/coders/gif.c
index b820443..9442ef8 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1181,7 +1181,7 @@
else if (iptc == MagickTrue)
(void) CopyMagickString(name,"iptc",sizeof(name));
else
- (void) FormatMagickString(name,sizeof(name),"gif:%.11s",
+ (void) FormatLocaleString(name,sizeof(name),"gif:%.11s",
header);
(void) SetImageProfile(image,name,profile);
info=(unsigned char *) RelinquishMagickMemory(info);
diff --git a/coders/hdr.c b/coders/hdr.c
index 1461fc4..15ee82b 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -292,7 +292,7 @@
(void) CopyMagickString(format,value,MaxTextExtent);
break;
}
- (void) FormatMagickString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value);
break;
}
@@ -301,10 +301,10 @@
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- image->gamma=StringToDouble(value,(char **) NULL);
+ image->gamma=LocaleToDouble(value,(char **) NULL);
break;
}
- (void) FormatMagickString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value);
break;
}
@@ -331,7 +331,7 @@
image->chromaticity.white_point.y=white_point[1];
break;
}
- (void) FormatMagickString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value);
break;
}
@@ -349,13 +349,13 @@
image->rows=(size_t) height;
break;
}
- (void) FormatMagickString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value);
break;
}
default:
{
- (void) FormatMagickString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value);
break;
}
@@ -693,22 +693,22 @@
if ((property != (const char *) NULL) &&
(strchr(property,'\n') == (char *) NULL))
{
- count=FormatMagickString(header,MaxTextExtent,"#%s\n",property);
+ count=FormatLocaleString(header,MaxTextExtent,"#%s\n",property);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
}
property=GetImageProperty(image,"hdr:exposure");
if (property != (const char *) NULL)
{
- count=FormatMagickString(header,MaxTextExtent,"EXPOSURE=%g\n",
+ count=FormatLocaleString(header,MaxTextExtent,"EXPOSURE=%g\n",
atof(property));
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
}
if (image->gamma != 0.0)
{
- count=FormatMagickString(header,MaxTextExtent,"GAMMA=%g\n",image->gamma);
+ count=FormatLocaleString(header,MaxTextExtent,"GAMMA=%g\n",image->gamma);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
}
- count=FormatMagickString(header,MaxTextExtent,
+ count=FormatLocaleString(header,MaxTextExtent,
"PRIMARIES=%g %g %g %g %g %g %g %g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,image->chromaticity.green_primary.y,
@@ -717,7 +717,7 @@
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
length=CopyMagickString(header,"FORMAT=32-bit_rle_rgbe\n\n",MaxTextExtent);
(void) WriteBlob(image,length,(unsigned char *) header);
- count=FormatMagickString(header,MaxTextExtent,"-Y %.20g +X %.20g\n",
+ count=FormatLocaleString(header,MaxTextExtent,"-Y %.20g +X %.20g\n",
(double) image->rows,(double) image->columns);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
/*
diff --git a/coders/histogram.c b/coders/histogram.c
index d04df57..95ad0a3 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -382,7 +382,7 @@
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,&image->exception);
if (LocaleCompare(write_info->magick,"HISTOGRAM") == 0)
- (void) FormatMagickString(histogram_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(histogram_image->filename,MaxTextExtent,
"miff:%s",write_info->filename);
status=WriteImage(write_info,histogram_image);
histogram_image=DestroyImage(histogram_image);
diff --git a/coders/html.c b/coders/html.c
index 73939a5..3bf0706 100644
--- a/coders/html.c
+++ b/coders/html.c
@@ -301,24 +301,24 @@
(void) WriteBlobString(image,"<head>\n");
value=GetImageProperty(image,"label");
if (value != (const char *) NULL)
- (void) FormatMagickString(buffer,MaxTextExtent,"<title>%s</title>\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<title>%s</title>\n",
value);
else
{
GetPathComponent(filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"<title>%s</title>\n",basename);
}
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"</head>\n");
(void) WriteBlobString(image,"<body style=\"text-align: center;\">\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"<h1>%s</h1>\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<h1>%s</h1>\n",
image->filename);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<div>\n");
(void) CopyMagickString(filename,image->filename,MaxTextExtent);
AppendImageFormat("png",filename);
- (void) FormatMagickString(buffer,MaxTextExtent,"<img usemap=\"#%s\" "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"<img usemap=\"#%s\" "
"src=\"%s\" style=\"border: 0;\" alt=\"Image map\" />\n",mapname,
filename);
(void) WriteBlobString(image,buffer);
@@ -331,15 +331,15 @@
/*
Write an image map.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"<map id=\"%s\" name=\"%s\">\n",mapname,mapname);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent," <area href=\"%s",
+ (void) FormatLocaleString(buffer,MaxTextExtent," <area href=\"%s",
url);
(void) WriteBlobString(image,buffer);
if (image->directory == (char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%s\" shape=\"rect\" coords=\"0,0,%.20g,%.20g\" alt=\"\" />\n",
image->filename,(double) geometry.width-1,(double) geometry.height-
1);
@@ -351,14 +351,14 @@
(void) WriteBlobByte(image,(unsigned char) *p);
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,"\" shape="
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\" shape="
"\"rect\" coords=\"%.20g,%.20g,%.20g,%.20g\" alt=\"\" />\n",
(double) geometry.x,(double) geometry.y,(double) (geometry.x+
geometry.width-1),(double) (geometry.y+geometry.height-1));
(void) WriteBlobString(image,buffer);
if (*(p+1) != '\0')
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" <area href=%s\"",url);
(void) WriteBlobString(image,buffer);
}
@@ -408,14 +408,14 @@
/*
Write an image map.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"<map id=\"%s\" name=\"%s\">\n",mapname,mapname);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent," <area href=\"%s",url);
+ (void) FormatLocaleString(buffer,MaxTextExtent," <area href=\"%s",url);
(void) WriteBlobString(image,buffer);
if (image->directory == (char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%s\" shape=\"rect\" coords=\"0,0,%.20g,%.20g\" alt=\"\" />\n",
image->filename,(double) geometry.width-1,(double) geometry.height-1);
(void) WriteBlobString(image,buffer);
@@ -426,14 +426,14 @@
(void) WriteBlobByte(image,(unsigned char) *p);
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,"\" shape=\"rect\""
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\" shape=\"rect\""
" coords=\"%.20g,%.20g,%.20g,%.20g\" alt=\"\" />\n",
(double) geometry.x,(double) geometry.y,geometry.x+(double)
geometry.width-1,geometry.y+(double) geometry.height-1);
(void) WriteBlobString(image,buffer);
if (*(p+1) != '\0')
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" <area href=%s\"",url);
(void) WriteBlobString(image,buffer);
}
diff --git a/coders/jbig.c b/coders/jbig.c
index da1e447..db4339a 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -443,7 +443,7 @@
status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
if (status == MagickFalse)
return(status);
- version=StringToDouble(JBG_VERSION,(char **) NULL);
+ version=LocaleToDouble(JBG_VERSION,(char **) NULL);
scene=0;
do
{
diff --git a/coders/jp2.c b/coders/jp2.c
index c566d6f..5585cff 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -1004,7 +1004,7 @@
(GetImageQuantumDepth(image,MagickTrue)/8);
target_size=(number_pixels*rate)+header_size;
rate=target_size/number_pixels;
- (void) FormatMagickString(option,MaxTextExtent,"rate=%g",rate);
+ (void) FormatLocaleString(option,MaxTextExtent,"rate=%g",rate);
(void) ConcatenateString(&options,option);
}
status=jas_image_encode(jp2_image,jp2_stream,format,options) != 0 ?
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 8ae19e7..4ab629c 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -606,7 +606,7 @@
return(MagickTrue);
length-=2;
marker=jpeg_info->unread_marker-JPEG_APP0;
- (void) FormatMagickString(name,MaxTextExtent,"APP%d",marker);
+ (void) FormatLocaleString(name,MaxTextExtent,"APP%d",marker);
error_manager=(ErrorManager *) jpeg_info->client_data;
image=error_manager->image;
profile=AcquireStringInfo(length);
@@ -840,7 +840,7 @@
case JCS_CMYK:
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: CMYK");
- (void) FormatMagickString(sampling_factor,MaxTextExtent,
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,
"%dx%d,%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor,
jpeg_info->comp_info[1].h_samp_factor,
@@ -855,7 +855,7 @@
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Colorspace: GRAYSCALE");
- (void) FormatMagickString(sampling_factor,MaxTextExtent,"%dx%d",
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%dx%d",
jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor);
break;
@@ -863,7 +863,7 @@
case JCS_RGB:
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: RGB");
- (void) FormatMagickString(sampling_factor,MaxTextExtent,
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,
"%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor,
jpeg_info->comp_info[1].h_samp_factor,
@@ -876,7 +876,7 @@
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: %d",
jpeg_info->out_color_space);
- (void) FormatMagickString(sampling_factor,MaxTextExtent,
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,
"%dx%d,%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor,
jpeg_info->comp_info[1].h_samp_factor,
@@ -1165,7 +1165,7 @@
}
JPEGSetImageQuality(&jpeg_info,image);
JPEGSetImageSamplingFactor(&jpeg_info,image);
- (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
jpeg_info.out_color_space);
(void) SetImageProperty(image,"jpeg:colorspace",value);
if (image_info->ping != MagickFalse)
@@ -1384,7 +1384,7 @@
*version='\0';
#if defined(JPEG_LIB_VERSION)
- (void) FormatMagickString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION);
+ (void) FormatLocaleString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION);
#endif
entry=SetMagickInfo("JPEG");
entry->thread_support=NoThreadSupport;
diff --git a/coders/label.c b/coders/label.c
index 4a26c65..55886ae 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -174,7 +174,7 @@
draw_info->stroke_width+1.5);
if (draw_info->gravity == UndefinedGravity)
{
- (void) FormatMagickString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.ascent+
draw_info->stroke_width/2.0);
draw_info->geometry=AcquireString(geometry);
@@ -196,7 +196,7 @@
char
pointsize[MaxTextExtent];
- (void) FormatMagickString(pointsize,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(pointsize,MaxTextExtent,"%.20g",
draw_info->pointsize);
(void) SetImageProperty(image,"label:pointsize",pointsize);
}
diff --git a/coders/magick.c b/coders/magick.c
index bd7b1e4..14deb37 100644
--- a/coders/magick.c
+++ b/coders/magick.c
@@ -13536,7 +13536,7 @@
if (status == MagickFalse)
return(status);
(void) WriteBlobString(image,"/*\n");
- (void) FormatMagickString(buffer,MaxTextExtent," %s (%s).\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent," %s (%s).\n",
image->filename,image->storage_class == DirectClass ? "PNM" : "GIF");
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"*/\n");
@@ -13547,7 +13547,7 @@
p=(char *) blob;
for (i=0; i < (ssize_t) length ; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"0x%02X, ",*p & 0xff);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",*p & 0xff);
(void) WriteBlobString(image,buffer);
if (((i+1) % 12) == 0)
{
diff --git a/coders/mat.c b/coders/mat.c
index 21002ad..b48d32d 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -1198,7 +1198,7 @@
(void) memcpy(&local_time,localtime(¤t_time),sizeof(local_time));
#endif
(void) memset(MATLAB_HDR,' ',MagickMin(sizeof(MATLAB_HDR),124));
- FormatMagickString(MATLAB_HDR,MaxTextExtent,"MATLAB 5.0 MAT-file, Platform: %s, Created on: %s %s %2d %2d:%2d:%2d %d",
+ FormatLocaleString(MATLAB_HDR,MaxTextExtent,"MATLAB 5.0 MAT-file, Platform: %s, Created on: %s %s %2d %2d:%2d:%2d %d",
OsDesc,DayOfWTab[local_time.tm_wday],MonthsTab[local_time.tm_mon],
local_time.tm_mday,local_time.tm_hour,local_time.tm_min,
local_time.tm_sec,local_time.tm_year+1900);
diff --git a/coders/matte.c b/coders/matte.c
index 4f9ddb1..a415208 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -208,7 +208,7 @@
if (status == MagickFalse)
break;
}
- (void) FormatMagickString(matte_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(matte_image->filename,MaxTextExtent,
"MIFF:%s",image->filename);
status=WriteImage(image_info,matte_image);
matte_image=DestroyImage(matte_image);
diff --git a/coders/meta.c b/coders/meta.c
index 2785d14..b918eb0 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1161,7 +1161,7 @@
char
name[MaxTextExtent];
- (void) FormatMagickString(name,MaxTextExtent,"APP%d",1);
+ (void) FormatLocaleString(name,MaxTextExtent,"APP%d",1);
buff=AcquireImage((ImageInfo *) NULL);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
@@ -1768,7 +1768,7 @@
(void) WriteBlobByte(ofile,(unsigned char) *s);
else
{
- (void) FormatMagickString(temp,MaxTextExtent,"&#%d;", c & 255);
+ (void) FormatLocaleString(temp,MaxTextExtent,"&#%d;", c & 255);
(void) WriteBlobString(ofile,temp);
}
break;
@@ -1946,10 +1946,10 @@
/* now finish up by formatting this binary data into ASCII equivalent */
if (strlen((char *)readable) > 0)
- (void) FormatMagickString(temp,MaxTextExtent,"%d#%d#%s=",
+ (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d#%s=",
(unsigned int) dataset, (unsigned int) recnum, readable);
else
- (void) FormatMagickString(temp,MaxTextExtent,"%d#%d=",
+ (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d=",
(unsigned int) dataset,(unsigned int) recnum);
(void) WriteBlobString(ofile,temp);
formatString( ofile, (char *)str, taglen );
@@ -2077,10 +2077,10 @@
/* now finish up by formatting this binary data into ASCII equivalent */
if (strlen((char *)readable) > 0)
- (void) FormatMagickString(temp,MaxTextExtent,"%d#%d#%s=",
+ (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d#%s=",
(unsigned int) dataset,(unsigned int) recnum, readable);
else
- (void) FormatMagickString(temp,MaxTextExtent,"%d#%d=",
+ (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d=",
(unsigned int) dataset,(unsigned int) recnum);
(void) WriteBlobString(ofile,temp);
formatString( ofile, (char *)str, taglen );
@@ -2203,10 +2203,10 @@
* ASCII equivalent
*/
if (strlen((const char *)PString) > 0)
- (void) FormatMagickString(temp,MaxTextExtent,"8BIM#%d#%s=",ID,
+ (void) FormatLocaleString(temp,MaxTextExtent,"8BIM#%d#%s=",ID,
PString);
else
- (void) FormatMagickString(temp,MaxTextExtent,"8BIM#%d=",ID);
+ (void) FormatLocaleString(temp,MaxTextExtent,"8BIM#%d=",ID);
(void) WriteBlobString(ofile,temp);
if (ID == IPTC_ID)
{
diff --git a/coders/miff.c b/coders/miff.c
index 661419f..15bcb02 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -747,7 +747,7 @@
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- image->gamma=StringToDouble(options,(char **) NULL);
+ image->gamma=LocaleToDouble(options,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"gravity") == 0)
@@ -1014,7 +1014,7 @@
{
if (LocaleCompare(keyword,"version") == 0)
{
- version=StringToDouble(options,(char **) NULL);
+ version=LocaleToDouble(options,(char **) NULL);
break;
}
(void) SetImageProperty(image,keyword,options);
@@ -1952,49 +1952,49 @@
Write MIFF header.
*/
(void) WriteBlobString(image,"id=ImageMagick version=1.0\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"class=%s colors=%.20g matte=%s\n",CommandOptionToMnemonic(
MagickClassOptions,image->storage_class),(double) image->colors,
CommandOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"columns=%.20g rows=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"columns=%.20g rows=%.20g "
"depth=%.20g\n",(double) image->columns,(double) image->rows,(double)
image->depth);
(void) WriteBlobString(image,buffer);
if (image->type != UndefinedType)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n",
CommandOptionToMnemonic(MagickTypeOptions,image->type));
(void) WriteBlobString(image,buffer);
}
if (image->colorspace != UndefinedColorspace)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"colorspace=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n",
CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
(void) WriteBlobString(image,buffer);
}
if (compression != UndefinedCompression)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"compression=%s "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"compression=%s "
"quality=%.20g\n",CommandOptionToMnemonic(MagickCompressOptions,
compression),(double) image->quality);
(void) WriteBlobString(image,buffer);
}
if (image->units != UndefinedResolution)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"units=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n",
CommandOptionToMnemonic(MagickResolutionOptions,image->units));
(void) WriteBlobString(image,buffer);
}
if ((image->x_resolution != 0) || (image->y_resolution != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"resolution=%gx%g\n",image->x_resolution,image->y_resolution);
(void) WriteBlobString(image,buffer);
}
if ((image->page.width != 0) || (image->page.height != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
(void) WriteBlobString(image,buffer);
@@ -2002,13 +2002,13 @@
else
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
(long) image->page.x,(long) image->page.y);
(void) WriteBlobString(image,buffer);
}
if ((image->tile_offset.x != 0) || (image->tile_offset.y != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
(long) image->tile_offset.x,(long) image->tile_offset.y);
(void) WriteBlobString(image,buffer);
}
@@ -2016,11 +2016,11 @@
(GetPreviousImageInList(image) != (Image *) NULL))
{
if (image->scene == 0)
- (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g "
"delay=%.20g ticks-per-second=%.20g\n",(double) image->iterations,
(double) image->delay,(double) image->ticks_per_second);
else
- (void) FormatMagickString(buffer,MaxTextExtent,"scene=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g "
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double)
image->scene,(double) image->iterations,(double) image->delay,
(double) image->ticks_per_second);
@@ -2030,51 +2030,51 @@
{
if (image->scene != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"scene=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
}
if (image->iterations != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n",
(double) image->iterations);
(void) WriteBlobString(image,buffer);
}
if (image->delay != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"delay=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n",
(double) image->delay);
(void) WriteBlobString(image,buffer);
}
if (image->ticks_per_second != UndefinedTicksPerSecond)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"ticks-per-second=%.20g\n",(double) image->ticks_per_second);
(void) WriteBlobString(image,buffer);
}
}
if (image->gravity != UndefinedGravity)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"gravity=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n",
CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
(void) WriteBlobString(image,buffer);
}
if (image->dispose != UndefinedDispose)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"dispose=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n",
CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
(void) WriteBlobString(image,buffer);
}
if (image->rendering_intent != UndefinedIntent)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"rendering-intent=%s\n",
CommandOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
(void) WriteBlobString(image,buffer);
}
if (image->gamma != 0.0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"gamma=%g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n",
image->gamma);
(void) WriteBlobString(image,buffer);
}
@@ -2083,7 +2083,7 @@
/*
Note chomaticity points.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"red-primary=%g,"
+ (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary=%g,"
"%g green-primary=%g,%g blue-primary=%g,%g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,
@@ -2091,14 +2091,14 @@
image->chromaticity.blue_primary.x,
image->chromaticity.blue_primary.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"white-point=%g,%g\n",image->chromaticity.white_point.x,
image->chromaticity.white_point.y);
(void) WriteBlobString(image,buffer);
}
if (image->orientation != UndefinedOrientation)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"orientation=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"orientation=%s\n",
CommandOptionToMnemonic(MagickOrientationOptions,image->orientation));
(void) WriteBlobString(image,buffer);
}
@@ -2120,7 +2120,7 @@
profile=GetImageProfile(image,name);
if (profile != (StringInfo *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"profile:%s=%.20g\n",name,(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
@@ -2130,7 +2130,7 @@
}
if (image->montage != (char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"montage=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n",
image->montage);
(void) WriteBlobString(image,buffer);
}
@@ -2140,7 +2140,7 @@
property=GetNextImageProperty(image);
while (property != (const char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s=",property);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,property);
if (value != (const char *) NULL)
diff --git a/coders/mpc.c b/coders/mpc.c
index 645a9e9..1235d3b 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -444,7 +444,7 @@
}
if (LocaleCompare(keyword,"error") == 0)
{
- image->error.mean_error_per_pixel=StringToDouble(options,(char **) NULL);
+ image->error.mean_error_per_pixel=LocaleToDouble(options,(char **) NULL);
break;
}
(void) SetImageProperty(image,keyword,options);
@@ -455,7 +455,7 @@
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- image->gamma=StringToDouble(options,(char **) NULL);
+ image->gamma=LocaleToDouble(options,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"green-primary") == 0)
@@ -511,12 +511,12 @@
if (LocaleCompare(keyword,"maximum-error") == 0)
{
image->error.normalized_maximum_error=
- StringToDouble(options,(char **) NULL);
+ LocaleToDouble(options,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"mean-error") == 0)
{
- image->error.normalized_mean_error=StringToDouble(options,(char **) NULL);
+ image->error.normalized_mean_error=LocaleToDouble(options,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"montage") == 0)
@@ -1073,58 +1073,58 @@
(image->colors > (one << depth)))
image->storage_class=DirectClass;
(void) WriteBlobString(image,"id=MagickCache\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"quantum-depth=%d\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"quantum-depth=%d\n",
MAGICKCORE_QUANTUM_DEPTH);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"class=%s colors=%.20g matte=%s\n",CommandOptionToMnemonic(
MagickClassOptions,image->storage_class),(double) image->colors,
CommandOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"columns=%.20g rows=%.20g depth=%.20g\n",(double) image->columns,
(double) image->rows,(double) image->depth);
(void) WriteBlobString(image,buffer);
if (image->type != UndefinedType)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n",
CommandOptionToMnemonic(MagickTypeOptions,image->type));
(void) WriteBlobString(image,buffer);
}
if (image->colorspace != UndefinedColorspace)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"colorspace=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n",
CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
(void) WriteBlobString(image,buffer);
}
if (image->endian != UndefinedEndian)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"endian=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"endian=%s\n",
CommandOptionToMnemonic(MagickEndianOptions,image->endian));
(void) WriteBlobString(image,buffer);
}
if (image->compression != UndefinedCompression)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"compression=%s quality=%.20g\n",CommandOptionToMnemonic(
MagickCompressOptions,image->compression),(double) image->quality);
(void) WriteBlobString(image,buffer);
}
if (image->units != UndefinedResolution)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"units=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n",
CommandOptionToMnemonic(MagickResolutionOptions,image->units));
(void) WriteBlobString(image,buffer);
}
if ((image->x_resolution != 0) || (image->y_resolution != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"resolution=%gx%g\n",image->x_resolution,image->y_resolution);
(void) WriteBlobString(image,buffer);
}
if ((image->page.width != 0) || (image->page.height != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
(void) WriteBlobString(image,buffer);
@@ -1132,13 +1132,13 @@
else
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
(long) image->page.x,(long) image->page.y);
(void) WriteBlobString(image,buffer);
}
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
(long) image->tile_offset.x,(long) image->tile_offset.y);
(void) WriteBlobString(image,buffer);
}
@@ -1146,12 +1146,12 @@
(GetPreviousImageInList(image) != (Image *) NULL))
{
if (image->scene == 0)
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double)
image->iterations,(double) image->delay,(double)
image->ticks_per_second);
else
- (void) FormatMagickString(buffer,MaxTextExtent,"scene=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g "
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",
(double) image->scene,(double) image->iterations,(double)
image->delay,(double) image->ticks_per_second);
@@ -1161,51 +1161,51 @@
{
if (image->scene != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"scene=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
}
if (image->iterations != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n",
(double) image->iterations);
(void) WriteBlobString(image,buffer);
}
if (image->delay != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"delay=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n",
(double) image->delay);
(void) WriteBlobString(image,buffer);
}
if (image->ticks_per_second != UndefinedTicksPerSecond)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"ticks-per-second=%.20g\n",(double) image->ticks_per_second);
(void) WriteBlobString(image,buffer);
}
}
if (image->gravity != UndefinedGravity)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"gravity=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n",
CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
(void) WriteBlobString(image,buffer);
}
if (image->dispose != UndefinedDispose)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"dispose=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n",
CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
(void) WriteBlobString(image,buffer);
}
if (image->rendering_intent != UndefinedIntent)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"rendering-intent=%s\n",CommandOptionToMnemonic(MagickIntentOptions,
image->rendering_intent));
(void) WriteBlobString(image,buffer);
}
if (image->gamma != 0.0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"gamma=%g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n",
image->gamma);
(void) WriteBlobString(image,buffer);
}
@@ -1214,7 +1214,7 @@
/*
Note chomaticity points.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"red-primary="
+ (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary="
"%g,%g green-primary=%g,%g blue-primary=%g,%g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,
@@ -1222,14 +1222,14 @@
image->chromaticity.blue_primary.x,
image->chromaticity.blue_primary.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"white-point=%g,%g\n",image->chromaticity.white_point.x,
image->chromaticity.white_point.y);
(void) WriteBlobString(image,buffer);
}
if (image->orientation != UndefinedOrientation)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"orientation=%s\n",CommandOptionToMnemonic(MagickOrientationOptions,
image->orientation));
(void) WriteBlobString(image,buffer);
@@ -1251,7 +1251,7 @@
profile=GetImageProfile(image,name);
if (profile != (StringInfo *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"profile:%s=%.20g\n",name,(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
@@ -1261,7 +1261,7 @@
}
if (image->montage != (char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"montage=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n",
image->montage);
(void) WriteBlobString(image,buffer);
}
@@ -1269,7 +1269,7 @@
property=GetNextImageProperty(image);
while (property != (const char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s=",property);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,property);
if (value != (const char *) NULL)
diff --git a/coders/mpeg.c b/coders/mpeg.c
index 554b5f2..5a72f91 100644
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -203,7 +203,7 @@
image=AcquireImage(image_info);
(void) InvokeDelegate(read_info,image,"mpeg:decode",(char *) NULL,exception);
image=DestroyImage(image);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"%s.%s",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.%s",
read_info->unique,ReadMPEGIntermediateFormat);
images=ReadImage(read_info,exception);
(void) RelinquishUniqueFileResource(read_info->filename);
@@ -512,7 +512,7 @@
file=AcquireUniqueFileResource(basename);
if (file != -1)
file=close(file)-1;
- (void) FormatMagickString(coalesce_image->filename,MaxTextExtent,"%s",
+ (void) FormatLocaleString(coalesce_image->filename,MaxTextExtent,"%s",
basename);
count=0;
write_info=CloneImageInfo(image_info);
@@ -537,11 +537,11 @@
Image
*frame;
- (void) FormatMagickString(p->filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(p->filename,MaxTextExtent,"%s%.20g.%s",
basename,(double) p->scene,WriteMPEGIntermediateFormat);
- (void) FormatMagickString(filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(filename,MaxTextExtent,"%s%.20g.%s",
basename,(double) p->scene,WriteMPEGIntermediateFormat);
- (void) FormatMagickString(previous_image,MaxTextExtent,
+ (void) FormatLocaleString(previous_image,MaxTextExtent,
"%s%.20g.%s",basename,(double) p->scene,
WriteMPEGIntermediateFormat);
frame=CloneImage(p,0,0,MagickTrue,&p->exception);
@@ -558,7 +558,7 @@
}
default:
{
- (void) FormatMagickString(filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(filename,MaxTextExtent,"%s%.20g.%s",
basename,(double) p->scene,WriteMPEGIntermediateFormat);
if (length > 0)
status=BlobToFile(filename,blob,length,&image->exception);
@@ -595,7 +595,7 @@
(void) CopyMagickString(coalesce_image->magick,image->magick,MaxTextExtent);
status=InvokeDelegate(write_info,coalesce_image,(char *) NULL,"mpeg:encode",
&image->exception);
- (void) FormatMagickString(write_info->filename,MaxTextExtent,"%s.%s",
+ (void) FormatLocaleString(write_info->filename,MaxTextExtent,"%s.%s",
write_info->unique,coalesce_image->magick);
status=CopyDelegateFile(write_info->filename,image->filename);
(void) RelinquishUniqueFileResource(write_info->filename);
@@ -609,7 +609,7 @@
delay=100.0*p->delay/MagickMax(1.0*p->ticks_per_second,1.0);
for (i=0; i < (ssize_t) MagickMax((1.0*delay+1.0)/3.0,1.0); i++)
{
- (void) FormatMagickString(p->filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(p->filename,MaxTextExtent,"%s%.20g.%s",
basename,(double) count++,WriteMPEGIntermediateFormat);
(void) RelinquishUniqueFileResource(p->filename);
}
diff --git a/coders/msl.c b/coders/msl.c
index 77cc40d..c9806e6 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -210,7 +210,7 @@
ImageInfo
*read_info;
- (void) FormatMagickString(key,MaxTextExtent,"cache:%s",path);
+ (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path);
sans_exception=AcquireExceptionInfo();
image=(Image *) GetImageRegistry(ImageRegistryType,key,sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
@@ -780,22 +780,22 @@
*p;
p=value;
- draw_info->affine.sx=StringToDouble(p,&p);
+ draw_info->affine.sx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.rx=StringToDouble(p,&p);
+ draw_info->affine.rx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ry=StringToDouble(p,&p);
+ draw_info->affine.ry=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.sy=StringToDouble(p,&p);
+ draw_info->affine.sy=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.tx=StringToDouble(p,&p);
+ draw_info->affine.tx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ty=StringToDouble(p,&p);
+ draw_info->affine.ty=LocaleToDouble(p,&p);
break;
}
if (LocaleCompare(keyword,"align") == 0)
@@ -900,7 +900,7 @@
{
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=StringToDouble(value,(char **) NULL);
+ draw_info->pointsize=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -912,7 +912,7 @@
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
@@ -937,14 +937,14 @@
}
if (LocaleCompare(keyword,"skewX") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.ry=tan(DegreesToRadians(fmod((double) angle,
360.0)));
break;
}
if (LocaleCompare(keyword,"skewY") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.rx=tan(DegreesToRadians(fmod((double) angle,
360.0)));
break;
@@ -1062,7 +1062,7 @@
}
}
}
- (void) FormatMagickString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
@@ -1199,7 +1199,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -1449,7 +1449,7 @@
{
if (LocaleCompare(keyword, "radius") == 0)
{
- radius = StringToDouble(value,(char **) NULL);
+ radius = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -1648,7 +1648,7 @@
}
if (LocaleCompare(keyword,"fuzz") == 0)
{
- msl_info->image[n]->fuzz=StringToDouble(value,(char **) NULL);
+ msl_info->image[n]->fuzz=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -1954,7 +1954,7 @@
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- rotate_image=RotateImage(composite_image,StringToDouble(value,(char **) NULL),
+ rotate_image=RotateImage(composite_image,LocaleToDouble(value,(char **) NULL),
&exception);
break;
}
@@ -2041,7 +2041,7 @@
}
}
image=msl_info->image[n];
- (void) FormatMagickString(composite_geometry,MaxTextExtent,
+ (void) FormatLocaleString(composite_geometry,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) composite_image->columns,
(double) composite_image->rows,(double) geometry.x,(double)
geometry.y);
@@ -2368,22 +2368,22 @@
*p;
p=value;
- draw_info->affine.sx=StringToDouble(p,&p);
+ draw_info->affine.sx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.rx=StringToDouble(p,&p);
+ draw_info->affine.rx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ry=StringToDouble(p,&p);
+ draw_info->affine.ry=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.sy=StringToDouble(p,&p);
+ draw_info->affine.sy=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.tx=StringToDouble(p,&p);
+ draw_info->affine.tx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ty=StringToDouble(p,&p);
+ draw_info->affine.ty=LocaleToDouble(p,&p);
break;
}
if (LocaleCompare(keyword,"align") == 0)
@@ -2493,7 +2493,7 @@
}
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=StringToDouble(value,(char **) NULL);
+ draw_info->pointsize=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -2505,7 +2505,7 @@
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
@@ -2530,13 +2530,13 @@
}
if (LocaleCompare(keyword,"skewX") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.ry=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
if (LocaleCompare(keyword,"skewY") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.rx=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
@@ -2653,7 +2653,7 @@
}
}
}
- (void) FormatMagickString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
@@ -2716,7 +2716,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -2781,7 +2781,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3155,7 +3155,7 @@
{
if (LocaleCompare(keyword,"blue") == 0)
{
- pixel.blue=StringToDouble(value,(char **) NULL);
+ pixel.blue=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3188,7 +3188,7 @@
}
if (LocaleCompare(keyword,"green") == 0)
{
- pixel.green=StringToDouble(value,(char **) NULL);
+ pixel.green=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3200,7 +3200,7 @@
{
if (LocaleCompare(keyword,"red") == 0)
{
- pixel.red=StringToDouble(value,(char **) NULL);
+ pixel.red=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3216,7 +3216,7 @@
}
}
if (*gamma == '\0')
- (void) FormatMagickString(gamma,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(gamma,MaxTextExtent,"%g,%g,%g",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
switch (channel)
{
@@ -3267,7 +3267,7 @@
{
if (LocaleCompare(keyword,"height") == 0)
{
- (void) FormatMagickString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
(double) msl_info->image[n]->rows);
(void) SetImageProperty(msl_info->attributes[n],key,value);
break;
@@ -3279,7 +3279,7 @@
{
if (LocaleCompare(keyword,"width") == 0)
{
- (void) FormatMagickString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
(double) msl_info->image[n]->columns);
(void) SetImageProperty(msl_info->attributes[n],key,value);
break;
@@ -3394,7 +3394,7 @@
{
if (LocaleCompare(keyword,"amount") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3463,7 +3463,7 @@
{
if (LocaleCompare(keyword,"black") == 0)
{
- levelBlack = StringToDouble(value,(char **) NULL);
+ levelBlack = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -3474,7 +3474,7 @@
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- levelGamma = StringToDouble(value,(char **) NULL);
+ levelGamma = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -3485,7 +3485,7 @@
{
if (LocaleCompare(keyword,"white") == 0)
{
- levelWhite = StringToDouble(value,(char **) NULL);
+ levelWhite = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -3502,7 +3502,7 @@
/* process image */
{
char level[MaxTextExtent + 1];
- (void) FormatMagickString(level,MaxTextExtent,"%3.6f/%3.6f/%3.6f/",
+ (void) FormatLocaleString(level,MaxTextExtent,"%3.6f/%3.6f/%3.6f/",
levelBlack,levelGamma,levelWhite);
LevelImage ( msl_info->image[n], level );
break;
@@ -3677,7 +3677,7 @@
{
if (LocaleCompare(keyword,"fuzz") == 0)
{
- msl_info->image[n]->fuzz=StringToDouble(value,(char **) NULL);
+ msl_info->image[n]->fuzz=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3706,7 +3706,7 @@
{
if (LocaleCompare(keyword,"opacity") == 0)
{
- opacity=StringToDouble(value,(char **) NULL);
+ opacity=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3800,7 +3800,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3888,12 +3888,12 @@
{
if (LocaleCompare(keyword,"blackness") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"brightness") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3917,7 +3917,7 @@
{
if (LocaleCompare(keyword,"hue") == 0)
{
- geometry_info.xi=StringToDouble(value,(char **) NULL);
+ geometry_info.xi=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3929,7 +3929,7 @@
{
if (LocaleCompare(keyword,"lightness") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3941,7 +3941,7 @@
{
if (LocaleCompare(keyword,"saturation") == 0)
{
- geometry_info.sigma=StringToDouble(value,(char **) NULL);
+ geometry_info.sigma=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3953,7 +3953,7 @@
{
if (LocaleCompare(keyword,"whiteness") == 0)
{
- geometry_info.sigma=StringToDouble(value,(char **) NULL);
+ geometry_info.sigma=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3968,7 +3968,7 @@
}
}
}
- (void) FormatMagickString(modulate,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g",
geometry_info.rho,geometry_info.sigma,geometry_info.xi);
(void) ModulateImage(msl_info->image[n],modulate);
break;
@@ -4140,7 +4140,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -4215,7 +4215,7 @@
}
if (LocaleCompare(keyword,"fuzz") == 0)
{
- msl_info->image[n]->fuzz=StringToDouble(value,(char **) NULL);
+ msl_info->image[n]->fuzz=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -4256,7 +4256,7 @@
{
if (LocaleCompare(keyword,"output") == 0)
{
- (void) fprintf(stdout,"%s",value);
+ (void) FormatLocaleFile(stdout,"%s",value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -4517,22 +4517,22 @@
*p;
p=value;
- draw_info->affine.sx=StringToDouble(p,&p);
+ draw_info->affine.sx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.rx=StringToDouble(p,&p);
+ draw_info->affine.rx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ry=StringToDouble(p,&p);
+ draw_info->affine.ry=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.sy=StringToDouble(p,&p);
+ draw_info->affine.sy=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.tx=StringToDouble(p,&p);
+ draw_info->affine.tx=LocaleToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ty=StringToDouble(p,&p);
+ draw_info->affine.ty=LocaleToDouble(p,&p);
break;
}
if (LocaleCompare(keyword,"align") == 0)
@@ -4637,7 +4637,7 @@
{
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=StringToDouble(value,(char **) NULL);
+ draw_info->pointsize=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -4649,7 +4649,7 @@
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
@@ -4674,13 +4674,13 @@
}
if (LocaleCompare(keyword,"skewX") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.ry=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
if (LocaleCompare(keyword,"skewY") == 0)
{
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
affine.rx=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
@@ -4797,7 +4797,7 @@
}
}
}
- (void) FormatMagickString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
@@ -5025,7 +5025,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -5203,7 +5203,7 @@
{
if (LocaleCompare(keyword,"blur") == 0)
{
- msl_info->image[n]->blur=StringToDouble(value,(char **) NULL);
+ msl_info->image[n]->blur=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -5232,7 +5232,7 @@
{
if (LocaleCompare(keyword,"x-resolution") == 0)
{
- x_resolution=StringToDouble(value,(char **) NULL);
+ x_resolution=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -5243,7 +5243,7 @@
{
if (LocaleCompare(keyword,"y-resolution") == 0)
{
- y_resolution=StringToDouble(value,(char **) NULL);
+ y_resolution=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -5363,7 +5363,7 @@
{
if (LocaleCompare(keyword,"support") == 0)
{
- blur=StringToDouble(value,(char **) NULL);
+ blur=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -5584,7 +5584,7 @@
{
if (LocaleCompare(keyword,"degrees") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -5646,7 +5646,7 @@
{
if (LocaleCompare(keyword,"degrees") == 0)
{
- degrees = StringToDouble(value,(char **) NULL);
+ degrees = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -5868,7 +5868,7 @@
{
if (LocaleCompare(keyword,"cluster-threshold") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"colorspace") == 0)
@@ -5904,7 +5904,7 @@
{
if (LocaleCompare(keyword,"smoothing-threshold") == 0)
{
- geometry_info.sigma=StringToDouble(value,(char **) NULL);
+ geometry_info.sigma=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6052,10 +6052,10 @@
if (image_option != (const char *) NULL)
flags=ParseAbsoluteGeometry(image_option,&geometry);
flags=ParseAbsoluteGeometry(value,&geometry);
- (void) FormatMagickString(page,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(page,MaxTextExtent,"%.20gx%.20g",
(double) geometry.width,(double) geometry.height);
if (((flags & XValue) != 0) || ((flags & YValue) != 0))
- (void) FormatMagickString(page,MaxTextExtent,
+ (void) FormatLocaleString(page,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,
(double) geometry.height,(double) geometry.x,(double)
geometry.y);
@@ -6107,7 +6107,7 @@
{
if (LocaleCompare(keyword,"azimuth") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6119,7 +6119,7 @@
{
if (LocaleCompare(keyword,"elevation") == 0)
{
- geometry_info.sigma=StringToDouble(value,(char **) NULL);
+ geometry_info.sigma=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6230,7 +6230,7 @@
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry_info.xi=StringToDouble(value,(char **) NULL);
+ geometry_info.xi=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6294,7 +6294,7 @@
{
if (LocaleCompare(keyword, "radius") == 0)
{
- radius = StringToDouble(value,(char **) NULL);
+ radius = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -6477,7 +6477,7 @@
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6581,7 +6581,7 @@
{
if (LocaleCompare(keyword,"threshold") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6641,7 +6641,7 @@
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6888,7 +6888,7 @@
{
if (LocaleCompare(keyword,"degrees") == 0)
{
- geometry_info.rho=StringToDouble(value,(char **) NULL);
+ geometry_info.rho=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -7041,7 +7041,7 @@
{
if (LocaleCompare(keyword,"threshold") == 0)
{
- threshold = StringToDouble(value,(char **) NULL);
+ threshold = LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -7990,8 +7990,8 @@
{
if (LocaleCompare(keyword,"pointsize") == 0)
{
- image_info->pointsize=StringToDouble(value,(char **) NULL);
- draw_info->pointsize=StringToDouble(value,(char **) NULL);
+ image_info->pointsize=LocaleToDouble(value,(char **) NULL);
+ draw_info->pointsize=LocaleToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
diff --git a/coders/mtv.c b/coders/mtv.c
index a9132fd..a8476cd 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -367,7 +367,7 @@
/*
Initialize raster file header.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",(double)
image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
for (y=0; y < (ssize_t) image->rows; y++)
diff --git a/coders/pcd.c b/coders/pcd.c
index 65c5d1e..8013410 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -634,9 +634,9 @@
{
progress_monitor=SetImageProgressMonitor(image,
(MagickProgressMonitor) NULL,image->client_data);
- (void) FormatMagickString(image->filename,MaxTextExtent,
+ (void) FormatLocaleString(image->filename,MaxTextExtent,
"images/img%04ld.pcd",(long) j);
- (void) FormatMagickString(image->magick_filename,MaxTextExtent,
+ (void) FormatLocaleString(image->magick_filename,MaxTextExtent,
"images/img%04ld.pcd",(long) j);
image->scene=(size_t) j;
image->columns=width;
diff --git a/coders/pcl.c b/coders/pcl.c
index b7d8783..0607523 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -305,7 +305,7 @@
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
if (image_info->page != (char *) NULL)
(void) ParseAbsoluteGeometry(image_info->page,&page);
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
page.width,(double) page.height);
if (image_info->monochrome != MagickFalse)
delegate_info=GetDelegateInfo("pcl:mono",(char *) NULL,exception);
@@ -321,12 +321,12 @@
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
if (image_info->page != (char *) NULL)
(void) ParseAbsoluteGeometry(image_info->page,&page);
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",
+ (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",
image->x_resolution,image->y_resolution);
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)
+ (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
@@ -334,10 +334,10 @@
if (read_info->number_scenes != 0)
{
if (read_info->number_scenes != 1)
- (void) FormatMagickString(options,MaxTextExtent,"-dLastPage=%.20g",
+ (void) FormatLocaleString(options,MaxTextExtent,"-dLastPage=%.20g",
(double) (read_info->scene+read_info->number_scenes));
else
- (void) FormatMagickString(options,MaxTextExtent,
+ (void) FormatLocaleString(options,MaxTextExtent,
"-dFirstPage=%.20g -dLastPage=%.20g",(double) read_info->scene+1,
(double) (read_info->scene+read_info->number_scenes));
read_info->number_scenes=0;
@@ -345,11 +345,11 @@
*read_info->scenes='\0';
}
if (read_info->authenticate != (char *) NULL)
- (void) FormatMagickString(options+strlen(options),MaxTextExtent,
+ (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
" -sPCLPassword=%s",read_info->authenticate);
(void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
(void) AcquireUniqueFilename(read_info->filename);
- (void) FormatMagickString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MaxTextExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,
@@ -710,10 +710,10 @@
*/
(void) WriteBlobString(image,"\033E"); /* printer reset */
(void) WriteBlobString(image,"\033*r3F"); /* set presentation mode */
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*r%.20gs%.20gT",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*r%.20gs%.20gT",
(double) image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*t%.20gR",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*t%.20gR",(double)
density);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"\033&l0E"); /* top margin 0 */
@@ -754,7 +754,7 @@
(void) WriteBlobByte(image,8); /* bits per blue component */
for (i=0; i < (ssize_t) image->colors; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"\033*v%da%db%dc%.20gI",
ScaleQuantumToChar(image->colormap[i].red),
ScaleQuantumToChar(image->colormap[i].green),
@@ -763,7 +763,7 @@
}
for (one=1; i < (ssize_t) (one << bits_per_pixel); i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*v%.20gI",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*v%.20gI",
(double) i);
(void) WriteBlobString(image,buffer);
}
@@ -786,7 +786,7 @@
{
case NoCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*b0M");
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b0M");
(void) WriteBlobString(image,buffer);
break;
}
@@ -801,7 +801,7 @@
}
(void) ResetMagickMemory(compress_pixels,0,(length+256)*
sizeof(*compress_pixels));
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*b2M");
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b2M");
(void) WriteBlobString(image,buffer);
break;
}
@@ -827,7 +827,7 @@
}
(void) ResetMagickMemory(previous_pixels,0,(length+1)*
sizeof(*previous_pixels));
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*b3M");
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b3M");
(void) WriteBlobString(image,buffer);
break;
}
@@ -899,7 +899,7 @@
{
case NoCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*b%.20gW",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW",
(double) length);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,length,pixels);
@@ -908,7 +908,7 @@
case RLECompression:
{
packets=PCLPackbitsCompressImage(length,pixels,compress_pixels);
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*b%.20gW",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW",
(double) packets);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,packets,compress_pixels);
@@ -921,7 +921,7 @@
previous_pixels[i]=(~pixels[i]);
packets=PCLDeltaCompressImage(length,previous_pixels,pixels,
compress_pixels);
- (void) FormatMagickString(buffer,MaxTextExtent,"\033*b%.20gW",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW",
(double) packets);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,packets,compress_pixels);
diff --git a/coders/pdf.c b/coders/pdf.c
index 8166b5c..1326f4d 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -458,7 +458,7 @@
/*
Note spot names.
*/
- (void) FormatMagickString(property,MaxTextExtent,"pdf:SpotColor-%.20g",
+ (void) FormatLocaleString(property,MaxTextExtent,"pdf:SpotColor-%.20g",
(double) spotcolor++);
i=0;
for (c=ReadBlobByte(image); c != EOF; c=ReadBlobByte(image))
@@ -526,7 +526,7 @@
/*
Set PDF render geometry.
*/
- (void) FormatMagickString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MaxTextExtent,
"%gx%g%+.15g%+.15g",bounds.x2-bounds.x1,bounds.y2-bounds.y1,
bounds.x1,bounds.y1);
(void) SetImageProperty(image,"pdf:HiResBoundingBox",geometry);
@@ -586,7 +586,7 @@
if ((flags & SigmaValue) == 0)
image->y_resolution=image->x_resolution;
}
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",image->x_resolution,
+ (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->x_resolution,
image->y_resolution);
if (image_info->page != (char *) NULL)
{
@@ -595,7 +595,7 @@
delta.x)+0.5);
page.height=(size_t) floor((double) (page.height*image->y_resolution/
delta.y)+0.5);
- (void) FormatMagickString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
+ (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
}
if (cmyk != MagickFalse)
@@ -611,7 +611,7 @@
char
pages[MaxTextExtent];
- (void) FormatMagickString(pages,MaxTextExtent,"-dFirstPage=%.20g "
+ (void) FormatLocaleString(pages,MaxTextExtent,"-dFirstPage=%.20g "
"-dLastPage=%.20g",(double) read_info->scene+1,(double)
(read_info->scene+read_info->number_scenes));
(void) ConcatenateMagickString(options,pages,MaxTextExtent);
@@ -620,12 +620,12 @@
*read_info->scenes='\0';
}
if (read_info->authenticate != (char *) NULL)
- (void) FormatMagickString(options+strlen(options),MaxTextExtent,
+ (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
" -sPDFPassword=%s",read_info->authenticate);
(void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
(void) AcquireUniqueFilename(filename);
(void) ConcatenateMagickString(filename,"-%08d",MaxTextExtent);
- (void) FormatMagickString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MaxTextExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,filename,
@@ -1073,7 +1073,7 @@
version=(size_t) MagickMax(version,4);
if (LocaleCompare(image_info->magick,"PDFA") == 0)
version=(size_t) MagickMax(version,6);
- (void) FormatMagickString(buffer,MaxTextExtent,"%%PDF-1.%.20g \n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%PDF-1.%.20g \n",
(double) version);
(void) WriteBlobString(image,buffer);
if (LocaleCompare(image_info->magick,"PDFA") == 0)
@@ -1083,19 +1083,19 @@
*/
xref[object++]=TellBlob(image);
root_id=object;
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(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 %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",
(double) object+1);
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,"/Metadata %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Metadata %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",
(double) object+2);
}
(void) WriteBlobString(image,buffer);
@@ -1117,7 +1117,7 @@
Write XMP object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",
(double) object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -1131,10 +1131,10 @@
if (value != (const char *) NULL)
(void) CopyMagickString(create_date,value,MaxTextExtent);
(void) FormatMagickTime(time((time_t *) NULL),MaxTextExtent,timestamp);
- i=FormatMagickString(xmp_profile,MaxTextExtent,XMPProfile,
+ i=FormatLocaleString(xmp_profile,MaxTextExtent,XMPProfile,
XMPProfileMagick,modify_date,create_date,timestamp,
GetMagickVersion(&version),GetMagickVersion(&version));
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g\n",
(double) i);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Type /Metadata\n");
@@ -1148,12 +1148,12 @@
*/
xref[object++]=TellBlob(image);
pages_id=object;
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(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 [ %.20g 0 R ",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Kids [ %.20g 0 R ",
(double) object+1);
(void) WriteBlobString(image,buffer);
count=(ssize_t) (pages_id+ObjectsPerImage+1);
@@ -1168,7 +1168,7 @@
kid_image=image;
for ( ; GetNextImageInList(kid_image) != (Image *) NULL; count+=ObjectsPerImage)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 R ",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 R ",(double)
count);
(void) WriteBlobString(image,buffer);
kid_image=GetNextImageInList(kid_image);
@@ -1179,7 +1179,7 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
}
(void) WriteBlobString(image,"]\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Count %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Count %.20g\n",
(double) ((count-pages_id)/ObjectsPerImage));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1279,13 +1279,13 @@
resolution.y=(double) ((size_t) (100.0*2.54*resolution.y+0.5)/100.0);
}
SetGeometry(image,&geometry);
- (void) FormatMagickString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(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,
+ (void) FormatLocaleString(page_geometry,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,
(double) image->page.height,(double) image->page.x,(double)
image->page.y);
@@ -1320,12 +1320,12 @@
Write Page object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(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 %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Parent %.20g 0 R\n",
(double) pages_id);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Resources <<\n");
@@ -1335,30 +1335,30 @@
labels=StringToList(value);
if (labels != (char **) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"/Font << /F%.20g %.20g 0 R >>\n",(double) image->scene,(double)
object+4);
(void) WriteBlobString(image,buffer);
}
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"/XObject << /Im%.20g %.20g 0 R >>\n",(double) image->scene,(double)
object+5);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ProcSet %.20g 0 R >>\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/ProcSet %.20g 0 R >>\n",
(double) object+3);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(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,
+ (void) FormatLocaleString(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 %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Contents %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Thumb %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Thumb %.20g 0 R\n",
(double) object+8);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1367,11 +1367,11 @@
Write Contents object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1382,22 +1382,22 @@
for (i=0; labels[i] != (char *) NULL; i++)
{
(void) WriteBlobString(image,"BT\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/F%.20g %g Tf\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/F%.20g %g Tf\n",
(double) image->scene,pointsize);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g Td\n",
+ (void) FormatLocaleString(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) FormatLocaleString(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 %.20g %.20g cm\n",
+ (void) FormatLocaleString(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%.20g Do\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Im%.20g Do\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"Q\n");
@@ -1408,17 +1408,17 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(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,"%.20g 0 obj\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",
(double) object);
(void) WriteBlobString(image,buffer);
if ((image->storage_class == DirectClass) || (image->colors > 256))
@@ -1435,7 +1435,7 @@
Write Font object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",
(double) object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -1443,7 +1443,7 @@
{
(void) WriteBlobString(image,"/Type /Font\n");
(void) WriteBlobString(image,"/Subtype /Type1\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Name /F%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /F%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/BaseFont /Helvetica\n");
@@ -1456,25 +1456,25 @@
Write XObject object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(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%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /Im%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
switch (compression)
{
case NoCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"ASCII85Decode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"ASCII85Decode");
break;
}
case JPEGCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"DCTDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"DCTDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
@@ -1484,7 +1484,7 @@
}
case JPEG2000Compression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"JPXDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"JPXDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
@@ -1494,12 +1494,12 @@
}
case LZWCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"LZWDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode");
break;
}
case ZipCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"FlateDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"FlateDecode");
break;
}
case FaxCompression:
@@ -1508,39 +1508,39 @@
(void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n",
MaxTextExtent);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/DecodeParms [ << "
"/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam,
(double) image->columns,(double) image->rows);
break;
}
default:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
"RunLengthDecode");
break;
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
(double) object+2);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression) ?
1 : 8);
(void) WriteBlobString(image,buffer);
if (image->matte != MagickFalse)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"/SMask %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/SMask %.20g 0 R\n",
(double) object+7);
(void) WriteBlobString(image,buffer);
}
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1870,10 +1870,10 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",
(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
@@ -1881,7 +1881,7 @@
Write Colorspace object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
if (image->colorspace == CMYKColorspace)
@@ -1898,7 +1898,7 @@
(compression == JPEG2000Compression))
(void) CopyMagickString(buffer,"/DeviceRGB\n",MaxTextExtent);
else
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"[ /Indexed /DeviceRGB %.20g %.20g 0 R ]\n",(double) image->colors-
1,(double) object+3);
(void) WriteBlobString(image,buffer);
@@ -1914,7 +1914,7 @@
if (tile_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,image->exception.reason);
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -1922,12 +1922,12 @@
{
case NoCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"ASCII85Decode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"ASCII85Decode");
break;
}
case JPEGCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"DCTDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"DCTDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
@@ -1937,7 +1937,7 @@
}
case JPEG2000Compression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"JPXDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"JPXDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
@@ -1947,12 +1947,12 @@
}
case LZWCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"LZWDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode");
break;
}
case ZipCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"FlateDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"FlateDecode");
break;
}
case FaxCompression:
@@ -1961,33 +1961,33 @@
(void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n",
MaxTextExtent);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/DecodeParms [ << "
"/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam,
(double) tile_image->columns,(double) tile_image->rows);
break;
}
default:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
"RunLengthDecode");
break;
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
tile_image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
tile_image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
(double) object-1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression) ?
1 : 8);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2290,14 +2290,14 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
if ((image->storage_class != DirectClass) && (image->colors <= 256) &&
@@ -2309,7 +2309,7 @@
(void) WriteBlobString(image,"<<\n");
if (compression == NoCompression)
(void) WriteBlobString(image,"/Filter [ /ASCII85Decode ]\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2343,10 +2343,10 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
@@ -2354,7 +2354,7 @@
Write softmask object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -2364,48 +2364,48 @@
{
(void) WriteBlobString(image,"/Type /XObject\n");
(void) WriteBlobString(image,"/Subtype /Image\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Ma%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /Ma%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
switch (compression)
{
case NoCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
"ASCII85Decode");
break;
}
case LZWCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,"LZWDecode");
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode");
break;
}
case ZipCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
"FlateDecode");
break;
}
default:
{
- (void) FormatMagickString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
"RunLengthDecode");
break;
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Width %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",
(double) image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Height %.20g\n",
+ (void) FormatLocaleString(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",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression)
? 1 : 8);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2491,10 +2491,10 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
if (GetNextImageInList(image) == (Image *) NULL)
@@ -2510,12 +2510,12 @@
*/
xref[object++]=TellBlob(image);
info_id=object;
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Title (%s)\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Title (%s)\n",
EscapeParenthesis(basename));
(void) WriteBlobString(image,buffer);
seconds=time((time_t *) NULL);
@@ -2524,14 +2524,14 @@
#else
(void) memcpy(&local_time,localtime(&seconds),sizeof(local_time));
#endif
- (void) FormatMagickString(date,MaxTextExtent,"D:%04d%02d%02d%02d%02d%02d",
+ (void) FormatLocaleString(date,MaxTextExtent,"D:%04d%02d%02d%02d%02d%02d",
local_time.tm_year+1900,local_time.tm_mon+1,local_time.tm_mday,
local_time.tm_hour,local_time.tm_min,local_time.tm_sec);
- (void) FormatMagickString(buffer,MaxTextExtent,"/CreationDate (%s)\n",date);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/CreationDate (%s)\n",date);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/ModDate (%s)\n",date);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/ModDate (%s)\n",date);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Producer (%s)\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Producer (%s)\n",
EscapeParenthesis(GetMagickVersion((size_t *) NULL)));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2541,30 +2541,30 @@
*/
offset=TellBlob(image)-xref[0]+10;
(void) WriteBlobString(image,"xref\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"0 %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"0 %.20g\n",(double)
object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"0000000000 65535 f \n");
for (i=0; i < (ssize_t) object; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%010lu 00000 n \n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%010lu 00000 n \n",
(unsigned long) xref[i]);
(void) WriteBlobString(image,buffer);
}
(void) WriteBlobString(image,"trailer\n");
(void) WriteBlobString(image,"<<\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"/Size %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Size %.20g\n",(double)
object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Info %.20g 0 R\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"/Info %.20g 0 R\n",(double)
info_id);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"/Root %.20g 0 R\n",(double)
+ (void) FormatLocaleString(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,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%EOF\n");
xref=(MagickOffsetType *) RelinquishMagickMemory(xref);
diff --git a/coders/pes.c b/coders/pes.c
index 125e0ca..d62c7aa 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -626,8 +626,8 @@
file=fdopen(unique_file,"wb");
if ((unique_file == -1) || (file == (FILE *) NULL))
ThrowImageException(FileOpenError,"UnableToCreateTemporaryFile");
- (void) fprintf(file,"<?xml version=\"1.0\"?>\n");
- (void) fprintf(file,"<svg xmlns=\"http://www.w3.org/2000/svg\" "
+ (void) FormatLocaleFile(file,"<?xml version=\"1.0\"?>\n");
+ (void) FormatLocaleFile(file,"<svg xmlns=\"http://www.w3.org/2000/svg\" "
"xlink=\"http://www.w3.org/1999/xlink\" "
"ev=\"http://www.w3.org/2001/xml-events\" version=\"1.1\" "
"baseProfile=\"full\" width=\"%g\" height=\"%g\">\n",bounds.x2-bounds.x1,
@@ -635,16 +635,16 @@
for (i=0; i < (ssize_t) number_blocks; i++)
{
offset=blocks[i].offset;
- (void) fprintf(file," <path stroke=\"#%02x%02x%02x\" fill=\"none\" "
+ (void) FormatLocaleFile(file," <path stroke=\"#%02x%02x%02x\" fill=\"none\" "
"d=\"M %g %g",blocks[i].color->red,blocks[i].color->green,
blocks[i].color->blue,stitches[offset].x-bounds.x1,
stitches[offset].y-bounds.y1);
for (j=1; j < (ssize_t) (blocks[i+1].offset-offset); j++)
- (void) fprintf(file," L %g %g",stitches[offset+j].x-bounds.x1,
+ (void) FormatLocaleFile(file," L %g %g",stitches[offset+j].x-bounds.x1,
stitches[offset+j].y-bounds.y1);
- (void) fprintf(file,"\"/>\n");
+ (void) FormatLocaleFile(file,"\"/>\n");
}
- (void) fprintf(file,"</svg>\n");
+ (void) FormatLocaleFile(file,"</svg>\n");
(void) fclose(file);
(void) CloseBlob(image);
image=DestroyImage(image);
@@ -653,7 +653,7 @@
*/
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"svg:%s",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"svg:%s",
filename);
image=ReadImage(read_info,exception);
if (image != (Image *) NULL)
diff --git a/coders/pict.c b/coders/pict.c
index a394e53..9ddf918 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1381,7 +1381,7 @@
read_info=DestroyImageInfo(read_info);
if (tile_image == (Image *) NULL)
continue;
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",
(double) MagickMax(image->columns,tile_image->columns),
(double) MagickMax(image->rows,tile_image->rows));
(void) SetImageExtent(image,
diff --git a/coders/plasma.c b/coders/plasma.c
index 9b4850e..afecebd 100644
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -159,7 +159,7 @@
*/
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,
"gradient:%s",image_info->filename);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
diff --git a/coders/png.c b/coders/png.c
index 189cb49..1779c71 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -1027,7 +1027,7 @@
char
msg[MaxTextExtent];
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"Expected %.20g bytes; found %.20g bytes",(double) length,
(double) check);
png_warning(png_ptr,msg);
@@ -2335,17 +2335,17 @@
/* encode ping_width, ping_height, ping_bit_depth, ping_color_type,
ping_interlace_method in value */
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"%d, %d",(int) ping_width, (int) ping_height);
(void) SetImageProperty(image,"PNG:IHDR.width,height ",msg);
- (void) FormatMagickString(msg,MaxTextExtent,"%d",(int) ping_bit_depth);
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth);
(void) SetImageProperty(image,"PNG:IHDR.bit_depth ",msg);
- (void) FormatMagickString(msg,MaxTextExtent,"%d",(int) ping_color_type);
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type);
(void) SetImageProperty(image,"PNG:IHDR.color_type ",msg);
- (void) FormatMagickString(msg,MaxTextExtent,"%d",
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",
(int) ping_interlace_method);
(void) SetImageProperty(image,"PNG:IHDR.interlace_method",msg);
}
@@ -3092,33 +3092,33 @@
if (num_text_total != 0)
{
/* libpng doesn't tell us whether they were tEXt, zTXt, or iTXt */
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"%d tEXt/zTXt/iTXt chunks were found", num_text_total);
(void) SetImageProperty(image,"PNG:text ",msg);
}
if (num_raw_profiles != 0)
{
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"%d were found", num_raw_profiles);
(void) SetImageProperty(image,"PNG:text-encoded profiles",msg);
}
if (png_get_valid(ping,ping_info,PNG_INFO_cHRM))
{
- (void) FormatMagickString(msg,MaxTextExtent,"%s",
+ (void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found (see Chromaticity, above)");
(void) SetImageProperty(image,"PNG:cHRM ",msg);
}
if (png_get_valid(ping,ping_info,PNG_INFO_bKGD))
{
- (void) FormatMagickString(msg,MaxTextExtent,"%s",
+ (void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found (see Background color, above)");
(void) SetImageProperty(image,"PNG:bKGD ",msg);
}
- (void) FormatMagickString(msg,MaxTextExtent,"%s",
+ (void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found");
if (png_get_valid(ping,ping_info,PNG_INFO_iCCP))
@@ -3130,7 +3130,7 @@
#if defined(PNG_sRGB_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_sRGB))
{
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"intent=%d (See Rendering intent)",
(int) intent);
(void) SetImageProperty(image,"PNG:sRGB ",msg);
@@ -3139,7 +3139,7 @@
if (png_get_valid(ping,ping_info,PNG_INFO_gAMA))
{
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"gamma=%.8g (See Gamma, above)",
file_gamma);
(void) SetImageProperty(image,"PNG:gAMA ",msg);
@@ -3148,7 +3148,7 @@
#if defined(PNG_pHYs_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_pHYs))
{
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"x_res=%.10g, y_res=%.10g, units=%d",
(double) x_resolution,(double) y_resolution, unit_type);
(void) SetImageProperty(image,"PNG:pHYs ",msg);
@@ -3158,7 +3158,7 @@
#if defined(PNG_oFFs_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_oFFs))
{
- (void) FormatMagickString(msg,MaxTextExtent,"x_off=%.20g, y_off=%.20g",
+ (void) FormatLocaleString(msg,MaxTextExtent,"x_off=%.20g, y_off=%.20g",
(double) image->page.x,(double) image->page.y);
(void) SetImageProperty(image,"PNG:oFFs ",msg);
}
@@ -3167,7 +3167,7 @@
if ((image->page.width != 0 && image->page.width != image->columns) ||
(image->page.height != 0 && image->page.height != image->rows))
{
- (void) FormatMagickString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MaxTextExtent,
"width=%.20g, height=%.20g",
(double) image->page.width,(double) image->page.height);
(void) SetImageProperty(image,"PNG:vpAg ",msg);
@@ -3891,7 +3891,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Reading jng_image from color_blob.");
- (void) FormatMagickString(color_image_info->filename,MaxTextExtent,"%s",
+ (void) FormatLocaleString(color_image_info->filename,MaxTextExtent,"%s",
color_image->filename);
color_image_info->ping=MagickFalse; /* To do: avoid this */
@@ -3948,7 +3948,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Reading opacity from alpha_blob.");
- (void) FormatMagickString(alpha_image_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(alpha_image_info->filename,MaxTextExtent,
"%s",alpha_image->filename);
jng_image=ReadImage(alpha_image_info,exception);
@@ -4472,7 +4472,7 @@
(mng_info->mng_height > 65535L))
ThrowReaderException(ImageError,"WidthOrHeightExceedsLimit");
- (void) FormatMagickString(page_geometry,MaxTextExtent,
+ (void) FormatLocaleString(page_geometry,MaxTextExtent,
"%.20gx%.20g+0+0",(double) mng_info->mng_width,(double)
mng_info->mng_height);
@@ -6840,7 +6840,7 @@
allocated_length);
dp+=description_length;
*dp++='\n';
- (void) FormatMagickString(dp,allocated_length-
+ (void) FormatLocaleString(dp,allocated_length-
(png_size_t) (dp-text[0].text),"%8lu ",(unsigned long) length);
dp+=8;
@@ -10798,7 +10798,7 @@
jpeg_image_info->type=GrayscaleType;
(void) SetImageType(jpeg_image,GrayscaleType);
(void) AcquireUniqueFilename(jpeg_image->filename);
- (void) FormatMagickString(jpeg_image_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent,
"%s",jpeg_image->filename);
}
@@ -11171,7 +11171,7 @@
(void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
(void) AcquireUniqueFilename(jpeg_image->filename);
- (void) FormatMagickString(jpeg_image_info->filename,MaxTextExtent,"%s",
+ (void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent,"%s",
jpeg_image->filename);
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
diff --git a/coders/pnm.c b/coders/pnm.c
index 85d6252..1dc040d 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -304,7 +304,7 @@
scale[MaxTextExtent];
(void) ReadBlobString(image,scale);
- quantum_scale=StringToDouble(scale,(char **) NULL);
+ quantum_scale=LocaleToDouble(scale,(char **) NULL);
}
else
{
@@ -1533,7 +1533,7 @@
break;
}
}
- (void) FormatMagickString(buffer,MaxTextExtent,"P%c\n",format);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"P%c\n",format);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,"comment");
if (value != (const char *) NULL)
@@ -1559,7 +1559,7 @@
{
if (image->colorspace != RGBColorspace)
(void) TransformImageColorspace(image,RGBColorspace);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",
(double) image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
}
@@ -1571,7 +1571,7 @@
/*
PAM header.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"WIDTH %.20g\nHEIGHT %.20g\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
@@ -1609,11 +1609,11 @@
}
if (image->depth > 16)
image->depth=16;
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"DEPTH %.20g\nMAXVAL %.20g\n",(double) packet_size,(double)
GetQuantumRange(image->depth));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n",
type);
(void) WriteBlobString(image,buffer);
}
@@ -1699,10 +1699,10 @@
{
index=PixelIntensityToQuantum(p);
if (image->depth <= 8)
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
ScaleQuantumToChar(index));
else
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
ScaleQuantumToShort(index));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
@@ -1757,12 +1757,12 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->depth <= 8)
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
"%u %u %u ",ScaleQuantumToChar(GetRedPixelComponent(p)),
ScaleQuantumToChar(GetGreenPixelComponent(p)),
ScaleQuantumToChar(GetBluePixelComponent(p)));
else
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
"%u %u %u ",ScaleQuantumToShort(GetRedPixelComponent(p)),
ScaleQuantumToShort(GetGreenPixelComponent(p)),
ScaleQuantumToShort(GetBluePixelComponent(p)));
@@ -1837,7 +1837,7 @@
*/
if (image->depth > 8)
image->depth=16;
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
GetQuantumRange(image->depth));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
@@ -1920,7 +1920,7 @@
*/
if (image->depth > 8)
image->depth=16;
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
GetQuantumRange(image->depth));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
diff --git a/coders/preview.c b/coders/preview.c
index a7be719..383cb89 100644
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -189,7 +189,7 @@
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,&image->exception);
if (LocaleCompare(write_info->magick,"PREVIEW") == 0)
- (void) FormatMagickString(preview_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(preview_image->filename,MaxTextExtent,
"miff:%s",image_info->filename);
status=WriteImage(write_info,preview_image);
preview_image=DestroyImage(preview_image);
diff --git a/coders/ps.c b/coders/ps.c
index c0f47c3..9bd3d58 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -622,7 +622,7 @@
/*
Note spot names.
*/
- (void) FormatMagickString(property,MaxTextExtent,"ps:SpotColor-%.20g",
+ (void) FormatLocaleString(property,MaxTextExtent,"ps:SpotColor-%.20g",
(double) (spotcolor++));
for (p=command; *p != '\0'; p++)
if (isspace((int) (unsigned char) *p) != 0)
@@ -662,7 +662,7 @@
/*
Set Postscript render geometry.
*/
- (void) FormatMagickString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MaxTextExtent,
"%gx%g%+.15g%+.15g",bounds.x2-bounds.x1,bounds.y2-bounds.y1,
bounds.x1,bounds.y1);
(void) SetImageProperty(image,"ps:HiResBoundingBox",geometry);
@@ -694,7 +694,7 @@
char
translate_geometry[MaxTextExtent];
- (void) FormatMagickString(translate_geometry,MaxTextExtent,
+ (void) FormatLocaleString(translate_geometry,MaxTextExtent,
"%g %g translate\n",-bounds.x1,-bounds.y1);
count=write(file,translate_geometry,(unsigned int)
strlen(translate_geometry));
@@ -727,7 +727,7 @@
if ((flags & SigmaValue) == 0)
image->y_resolution=image->x_resolution;
}
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",
+ (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",
image->x_resolution,image->y_resolution);
if (image_info->page != (char *) NULL)
(void) ParseAbsoluteGeometry(image_info->page,&page);
@@ -735,7 +735,7 @@
0.5);
page.height=(size_t) floor((double) (page.height*image->y_resolution/delta.y)+
0.5);
- (void) FormatMagickString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
+ (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
read_info=CloneImageInfo(image_info);
*read_info->magick='\0';
@@ -744,7 +744,7 @@
char
pages[MaxTextExtent];
- (void) FormatMagickString(pages,MaxTextExtent,"-dFirstPage=%.20g "
+ (void) FormatLocaleString(pages,MaxTextExtent,"-dFirstPage=%.20g "
"-dLastPage=%.20g",(double) read_info->scene+1,(double)
(read_info->scene+read_info->number_scenes));
(void) ConcatenateMagickString(options,pages,MaxTextExtent);
@@ -758,7 +758,7 @@
(void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
(void) AcquireUniqueFilename(filename);
(void) ConcatenateMagickString(filename,"-%08d",MaxTextExtent);
- (void) FormatMagickString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MaxTextExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,filename,
@@ -1449,13 +1449,13 @@
resolution.y=(double) ((size_t) (100.0*2.54*resolution.y+0.5)/100.0);
}
SetGeometry(image,&geometry);
- (void) FormatMagickString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(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,
+ (void) FormatLocaleString(page_geometry,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
@@ -1496,12 +1496,12 @@
MaxTextExtent);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%Creator: (ImageMagick)\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Title: (%s)\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: (%s)\n",
image->filename);
(void) WriteBlobString(image,buffer);
timer=time((time_t *) NULL);
(void) FormatMagickTime(timer,MaxTextExtent,date);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%CreationDate: (%s)\n",date);
(void) WriteBlobString(image,buffer);
bounds.x1=(double) geometry.x;
@@ -1514,11 +1514,11 @@
MaxTextExtent);
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%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,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
}
@@ -1529,14 +1529,14 @@
/*
Embed Photoshop profile.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%BeginPhotoshop: %.20g",(double) GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++)
{
if ((i % 32) == 0)
(void) WriteBlobString(image,"\n% ");
- (void) FormatMagickString(buffer,MaxTextExtent,"%02X",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%02X",
(unsigned int) (GetStringInfoDatum(profile)[i] & 0xff));
(void) WriteBlobString(image,buffer);
}
@@ -1549,7 +1549,7 @@
Embed XML profile.
*/
(void) WriteBlobString(image,"\n%begin_xml_code\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"\n%%begin_xml_packet: %.20g\n",(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
@@ -1572,7 +1572,7 @@
*/
(void) WriteBlobString(image,"%%Orientation: Portrait\n");
(void) WriteBlobString(image,"%%PageOrder: Ascend\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Pages: %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Pages: %.20g\n",
image_info->adjoin != MagickFalse ? (double)
GetImageListLength(image) : 1.0);
(void) WriteBlobString(image,buffer);
@@ -1605,7 +1605,7 @@
/*
Dump image as bitmap.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%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+
@@ -1668,7 +1668,7 @@
*/
for (s=PostscriptProlog; *s != (char *) NULL; s++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s\n",*s);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*s);
(void) WriteBlobString(image,buffer);
}
value=GetImageProperty(image,"label");
@@ -1677,13 +1677,13 @@
{
(void) WriteBlobString(image," /label 512 string def\n");
(void) WriteBlobString(image," currentfile label readline pop\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" 0 y %g add moveto label show pop\n",j*pointsize+12);
(void) WriteBlobString(image,buffer);
}
for (s=PostscriptEpilog; *s != (char *) NULL; s++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s\n",*s);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*s);
(void) WriteBlobString(image,buffer);
}
if (LocaleCompare(image_info->magick,"PS") == 0)
@@ -1691,10 +1691,10 @@
(void) WriteBlobString(image,"} bind def\n");
(void) WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
(double) (page++));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
(double) geometry.y,geometry.x+(double) geometry.width,geometry.y+(double)
(geometry.height+text_size));
@@ -1716,7 +1716,7 @@
/*
Output image data.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (void) FormatLocaleString(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;
@@ -1727,7 +1727,7 @@
{
for (i=0; labels[i] != (char *) NULL; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s \n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s \n",
labels[i]);
(void) WriteBlobString(image,buffer);
labels[i]=DestroyString(labels[i]);
@@ -1749,7 +1749,7 @@
/*
Dump image as grayscale.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%.20g %.20g\n1\n1\n1\n8\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
@@ -1798,7 +1798,7 @@
/*
Dump image as bitmap.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%.20g %.20g\n1\n1\n1\n1\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
@@ -1866,7 +1866,7 @@
/*
Dump DirectClass image.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
(double) image->columns,(double) image->rows,
image_info->compression == RLECompression ? 1 : 0);
(void) WriteBlobString(image,buffer);
@@ -1995,7 +1995,7 @@
/*
Dump PseudoClass image.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(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);
@@ -2003,12 +2003,12 @@
/*
Dump number of colors and colormap.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
image->colors);
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) image->colors; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%02X%02X%02X\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%02X%02X%02X\n",
ScaleQuantumToChar(image->colormap[i].red),
ScaleQuantumToChar(image->colormap[i].green),
ScaleQuantumToChar(image->colormap[i].blue));
@@ -2136,11 +2136,11 @@
(void) WriteBlobString(image,"%%Trailer\n");
if (page > 2)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%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,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,
bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
diff --git a/coders/ps2.c b/coders/ps2.c
index 9e014fe..27471fc 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -513,13 +513,13 @@
resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0;
}
SetGeometry(image,&geometry);
- (void) FormatMagickString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(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,
+ (void) FormatLocaleString(page_geometry,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
@@ -560,12 +560,12 @@
MaxTextExtent);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%Creator: (ImageMagick)\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Title: (%s)\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: (%s)\n",
image->filename);
(void) WriteBlobString(image,buffer);
timer=time((time_t *) NULL);
(void) FormatMagickTime(timer,MaxTextExtent,date);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%CreationDate: (%s)\n",date);
(void) WriteBlobString(image,buffer);
bounds.x1=(double) geometry.x;
@@ -578,11 +578,11 @@
MaxTextExtent);
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%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,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
}
@@ -601,7 +601,7 @@
if (image_info->adjoin == MagickFalse)
(void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent);
else
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%Pages: %.20g\n",(double) GetImageListLength(image));
(void) WriteBlobString(image,buffer);
}
@@ -617,31 +617,31 @@
{
case NoCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MaxTextExtent,*q,
"/ASCII85Decode filter");
break;
}
case JPEGCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MaxTextExtent,*q,
"/DCTDecode filter");
break;
}
case LZWCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MaxTextExtent,*q,
"/LZWDecode filter");
break;
}
case FaxCompression:
case Group4Compression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,*q," ");
+ (void) FormatLocaleString(buffer,MaxTextExtent,*q," ");
break;
}
default:
{
- (void) FormatMagickString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MaxTextExtent,*q,
"/RunLengthDecode filter");
break;
}
@@ -655,13 +655,13 @@
{
(void) WriteBlobString(image," /label 512 string def\n");
(void) WriteBlobString(image," currentfile label readline pop\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" 0 y %g add moveto label show pop\n",j*pointsize+12);
(void) WriteBlobString(image,buffer);
}
for (q=PostscriptEpilog; *q; q++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s\n",*q);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*q);
(void) WriteBlobString(image,buffer);
}
if (LocaleCompare(image_info->magick,"PS2") == 0)
@@ -669,10 +669,10 @@
(void) WriteBlobString(image,"} bind def\n");
(void) WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
(double) page++);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
(double) geometry.y,geometry.x+(double) geometry.width,geometry.y+(double)
(geometry.height+text_size));
@@ -691,7 +691,7 @@
if (LocaleCompare(image_info->magick,"PS2") != 0)
(void) WriteBlobString(image,"userdict begin\n");
start=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BeginData:%13ld %s Bytes\n",0L,
compression == NoCompression ? "ASCII" : "Binary");
(void) WriteBlobString(image,buffer);
@@ -700,7 +700,7 @@
/*
Output image data.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (void) FormatLocaleString(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;
@@ -711,7 +711,7 @@
{
for (i=0; labels[i] != (char *) NULL; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s \n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s \n",
labels[i]);
(void) WriteBlobString(image,buffer);
labels[i]=DestroyString(labels[i]);
@@ -725,16 +725,16 @@
((image_info->type != TrueColorType) &&
(IsGrayImage(image,&image->exception) != MagickFalse)))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
+ (void) FormatLocaleString(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",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
(int) ((compression != FaxCompression) &&
(compression != Group4Compression)));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"0\n");
- (void) FormatMagickString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
(compression == FaxCompression) ||
(compression == Group4Compression) ? 1 : 8);
(void) WriteBlobString(image,buffer);
@@ -838,11 +838,11 @@
if ((image->storage_class == DirectClass) || (image->colors > 256) ||
(compression == JPEGCompression) || (image->matte != MagickFalse))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
+ (void) FormatLocaleString(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",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
(int) (compression == NoCompression));
(void) WriteBlobString(image,buffer);
switch (compression)
@@ -988,19 +988,19 @@
/*
Dump number of colors and colormap.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
+ (void) FormatLocaleString(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",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
(int) (compression == NoCompression));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
image->colors);
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) image->colors; i++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%02X%02X%02X\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%02X%02X%02X\n",
ScaleQuantumToChar(image->colormap[i].red),
ScaleQuantumToChar(image->colormap[i].green),
ScaleQuantumToChar(image->colormap[i].blue));
@@ -1086,7 +1086,7 @@
offset=SeekBlob(image,start,SEEK_SET);
if (offset < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BeginData:%13ld %s Bytes\n",(long) length,
compression == NoCompression ? "ASCII" : "Binary");
(void) WriteBlobString(image,buffer);
@@ -1106,11 +1106,11 @@
(void) WriteBlobString(image,"%%Trailer\n");
if (page > 1)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%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,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,
bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
diff --git a/coders/ps3.c b/coders/ps3.c
index 521c78f..f8a717b 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -465,7 +465,7 @@
Note BeginData DSC comment for update later.
*/
start=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BeginData:%13ld %s Bytes\n",0L,compression == NoCompression ?
"ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -478,7 +478,7 @@
case NoCompression:
default:
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"currentfile %.20g %.20g "PS3_NoCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
@@ -486,28 +486,28 @@
case FaxCompression:
case Group4Compression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"currentfile %.20g %.20g "PS3_FaxCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
}
case LZWCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"currentfile %.20g %.20g "PS3_LZWCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
}
case RLECompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"currentfile %.20g %.20g "PS3_RLECompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
}
case ZipCompression:
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"currentfile %.20g %.20g "PS3_ZipCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
@@ -589,7 +589,7 @@
offset=SeekBlob(image,start,SEEK_SET);
if (offset < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BeginData:%13ld %s Bytes\n",(long) length,
compression == NoCompression ? "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -938,13 +938,13 @@
resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0;
}
SetGeometry(image,&geometry);
- (void) FormatMagickString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(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,
+ (void) FormatLocaleString(page_geometry,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
@@ -985,15 +985,15 @@
(void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n",
MaxTextExtent);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%Creator: ImageMagick %s\n",MagickLibVersionText);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Title: %s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: %s\n",
image->filename);
(void) WriteBlobString(image,buffer);
timer=time((time_t *) NULL);
(void) FormatMagickTime(timer,MaxTextExtent,date);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%CreationDate: %s\n",date);
(void) WriteBlobString(image,buffer);
bounds.x1=(double) geometry.x;
@@ -1008,11 +1008,11 @@
}
else
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BoundingBox: %g %g %g %g\n",floor(bounds.x1+0.5),
floor(bounds.y1+0.5),ceil(bounds.x2-0.5),ceil(bounds.y2-0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
@@ -1044,7 +1044,7 @@
if (image_info->adjoin == MagickFalse)
(void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent);
else
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%Pages: %.20g\n",(double) GetImageListLength(image));
(void) WriteBlobString(image,buffer);
}
@@ -1070,7 +1070,7 @@
{
(void) WriteBlobString(image,
" currentfile buffer readline pop token pop\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" 0 y %g add moveto show pop\n",i*pointsize+12);
(void) WriteBlobString(image,buffer);
}
@@ -1085,13 +1085,13 @@
}
(void)WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
(double) page);
(void) WriteBlobString(image,buffer);
/*
Page bounding box.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
(double) geometry.y,geometry.x+(double) geometry.width,geometry.y+
(double) (geometry.height+text_size));
@@ -1157,7 +1157,7 @@
Remember position of BeginData comment so we can update it.
*/
start=TellBlob(image);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BeginData:%13ld %s Bytes\n",0L,
compression == NoCompression ? "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -1166,7 +1166,7 @@
/*
Translate, scale, and font point size.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (void) FormatLocaleString(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);
/*
@@ -1214,7 +1214,7 @@
/*
Image columns, rows, and color space.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g %.20g\n%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%s\n",
(double) image->columns,(double) image->rows,image->colorspace ==
CMYKColorspace ? PS3_CMYKColorspace : PS3_RGBColorspace);
(void) WriteBlobString(image,buffer);
@@ -1289,7 +1289,7 @@
/*
1 bit or 8 bit components?
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
IsMonochromeImage(image,&image->exception) != MagickFalse ? 1 : 8);
(void) WriteBlobString(image,buffer);
/*
@@ -1469,7 +1469,7 @@
/*
Number of colors in color map.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",
(double) image->colors);
(void) WriteBlobString(image,buffer);
/*
@@ -1558,7 +1558,7 @@
offset=SeekBlob(image,start,SEEK_SET);
if (offset < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BeginData:%13ld %s Bytes\n",(long) length,
compression == NoCompression ? "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -1581,11 +1581,11 @@
(void) WriteBlobString(image,"%%Trailer\n");
if (page > 1)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%BoundingBox: %g %g %g %g\n",floor(bounds.x1+0.5),
floor(bounds.y1+0.5),ceil(bounds.x2-0.5),ceil(bounds.y2-0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,
bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
diff --git a/coders/psd.c b/coders/psd.c
index 21adfcb..da2b0a7 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -448,14 +448,14 @@
*/
p=PushShortPixel(MSBEndian,p,&resolution);
image->x_resolution=(double) resolution;
- (void) FormatMagickString(value,MaxTextExtent,"%g",image->x_resolution);
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",image->x_resolution);
(void) SetImageProperty(image,"tiff:XResolution",value);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&resolution);
image->y_resolution=(double) resolution;
- (void) FormatMagickString(value,MaxTextExtent,"%g",image->y_resolution);
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",image->y_resolution);
(void) SetImageProperty(image,"tiff:YResolution",value);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&short_sans);
@@ -1229,13 +1229,13 @@
/*
Set up some hidden attributes for folks that need them.
*/
- (void) FormatMagickString(message,MaxTextExtent,"%.20gld",
+ (void) FormatLocaleString(message,MaxTextExtent,"%.20gld",
(double) layer_info[i].page.x);
(void) SetImageArtifact(layer_info[i].image,"psd:layer.x",message);
- (void) FormatMagickString(message,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(message,MaxTextExtent,"%.20g",
(double) layer_info[i].page.y);
(void) SetImageArtifact(layer_info[i].image,"psd:layer.y",message);
- (void) FormatMagickString(message,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(message,MaxTextExtent,"%.20g",
(double) layer_info[i].opacity);
(void) SetImageArtifact(layer_info[i].image,"psd:layer.opacity",
message);
@@ -2340,7 +2340,7 @@
(void) WriteBlobMSBLong(image,16);
(void) WriteBlobMSBLong(image,0);
(void) WriteBlobMSBLong(image,0);
- (void) FormatMagickString((char *) layer_name,MaxTextExtent,
+ (void) FormatLocaleString((char *) layer_name,MaxTextExtent,
"L%06ld",(long) layer_count++);
WritePascalString( image, (char*)layer_name, 4 );
}
diff --git a/coders/pwp.c b/coders/pwp.c
index 02f7141..cba02dc 100644
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -217,7 +217,7 @@
next_image=ReadImage(read_info,exception);
if (next_image == (Image *) NULL)
break;
- (void) FormatMagickString(next_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(next_image->filename,MaxTextExtent,
"slide_%02ld.sfw",(long) next_image->scene);
if (image == (Image *) NULL)
image=next_image;
diff --git a/coders/sct.c b/coders/sct.c
index 528dbac..0addb62 100644
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -204,9 +204,9 @@
separations_mask=ReadBlobMSBShort(image);
count=ReadBlob(image,14,buffer);
buffer[14]='\0';
- height=StringToDouble((char *) buffer,(char **) NULL);
+ height=LocaleToDouble((char *) buffer,(char **) NULL);
count=ReadBlob(image,14,buffer);
- width=StringToDouble((char *) buffer,(char **) NULL);
+ width=LocaleToDouble((char *) buffer,(char **) NULL);
count=ReadBlob(image,12,buffer);
buffer[12]='\0';
image->rows=StringToUnsignedLong((char *) buffer);
diff --git a/coders/svg.c b/coders/svg.c
index 462e045..d0a81b9 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -98,11 +98,6 @@
#endif
/*
- Define declarations.
-*/
-#define MVGPrintf (void) fprintf
-
-/*
Typedef declarations.
*/
typedef struct _BoundingBox
@@ -302,7 +297,7 @@
assert(string != (const char *) NULL);
p=(const char *) string;
GetMagickToken(p,&p,token);
- value=StringToDouble(token,(char **) NULL);
+ value=LocaleToDouble(token,(char **) NULL);
if (strchr(token,'%') != (char *) NULL)
{
double
@@ -966,12 +961,12 @@
{
if (LocaleCompare((const char *) name,"circle") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"clipPath") == 0)
{
- MVGPrintf(svg_info->file,"push clip-path '%s'\n",id);
+ (void) FormatLocaleFile(svg_info->file,"push clip-path '%s'\n",id);
break;
}
break;
@@ -981,7 +976,7 @@
{
if (LocaleCompare((const char *) name,"defs") == 0)
{
- MVGPrintf(svg_info->file,"push defs\n");
+ (void) FormatLocaleFile(svg_info->file,"push defs\n");
break;
}
break;
@@ -991,7 +986,7 @@
{
if (LocaleCompare((const char *) name,"ellipse") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1001,7 +996,7 @@
{
if (LocaleCompare((const char *) name,"g") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1011,7 +1006,7 @@
{
if (LocaleCompare((const char *) name,"image") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1021,12 +1016,12 @@
{
if (LocaleCompare((const char *) name,"line") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"linearGradient") == 0)
{
- MVGPrintf(svg_info->file,
+ (void) FormatLocaleFile(svg_info->file,
"push gradient '%s' linear %g,%g %g,%g\n",id,
svg_info->segment.x1,svg_info->segment.y1,svg_info->segment.x2,
svg_info->segment.y2);
@@ -1039,12 +1034,12 @@
{
if (LocaleCompare((const char *) name,"path") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"pattern") == 0)
{
- MVGPrintf(svg_info->file,
+ (void) FormatLocaleFile(svg_info->file,
"push pattern '%s' %g,%g %g,%g\n",id,
svg_info->bounds.x,svg_info->bounds.y,svg_info->bounds.width,
svg_info->bounds.height);
@@ -1052,12 +1047,12 @@
}
if (LocaleCompare((const char *) name,"polygon") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"polyline") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1067,7 +1062,7 @@
{
if (LocaleCompare((const char *) name,"radialGradient") == 0)
{
- MVGPrintf(svg_info->file,
+ (void) FormatLocaleFile(svg_info->file,
"push gradient '%s' radial %g,%g %g,%g %g\n",
id,svg_info->element.cx,svg_info->element.cy,
svg_info->element.major,svg_info->element.minor,
@@ -1076,7 +1071,7 @@
}
if (LocaleCompare((const char *) name,"rect") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1086,7 +1081,7 @@
{
if (LocaleCompare((const char *) name,"svg") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1096,7 +1091,7 @@
{
if (LocaleCompare((const char *) name,"text") == 0)
{
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"tspan") == 0)
@@ -1113,7 +1108,7 @@
*text;
text=EscapeString(svg_info->text,'\'');
- MVGPrintf(svg_info->file,"text %g,%g '%s'\n",
+ (void) FormatLocaleFile(svg_info->file,"text %g,%g '%s'\n",
svg_info->bounds.x-svg_info->center.x,svg_info->bounds.y-
svg_info->center.y,text);
text=DestroyString(text);
@@ -1126,7 +1121,7 @@
draw_info=DestroyDrawInfo(draw_info);
*svg_info->text='\0';
}
- MVGPrintf(svg_info->file,"push graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"push graphic-context\n");
break;
}
break;
@@ -1148,7 +1143,7 @@
{
if (LocaleCompare(keyword,"angle") == 0)
{
- MVGPrintf(svg_info->file,"angle %g\n",
+ (void) FormatLocaleFile(svg_info->file,"angle %g\n",
GetUserSpaceCoordinateValue(svg_info,0,value));
break;
}
@@ -1159,18 +1154,18 @@
{
if (LocaleCompare(keyword,"clip-path") == 0)
{
- MVGPrintf(svg_info->file,"clip-path '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"clip-path '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"clip-rule") == 0)
{
- MVGPrintf(svg_info->file,"clip-rule '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"clip-rule '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"clipPathUnits") == 0)
{
(void) CloneString(&units,value);
- MVGPrintf(svg_info->file,"clip-units '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"clip-units '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"color") == 0)
@@ -1220,51 +1215,56 @@
{
if (LocaleCompare(value,"currentColor") == 0)
{
- MVGPrintf(svg_info->file,"fill '%s'\n",color);
+ (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",color);
break;
}
- MVGPrintf(svg_info->file,"fill '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"fillcolor") == 0)
{
- MVGPrintf(svg_info->file,"fill '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"fill-rule") == 0)
{
- MVGPrintf(svg_info->file,"fill-rule '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"fill-rule '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"fill-opacity") == 0)
{
- MVGPrintf(svg_info->file,"fill-opacity '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"fill-opacity '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"font-family") == 0)
{
- MVGPrintf(svg_info->file,"font-family '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"font-family '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"font-stretch") == 0)
{
- MVGPrintf(svg_info->file,"font-stretch '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"font-stretch '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"font-style") == 0)
{
- MVGPrintf(svg_info->file,"font-style '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"font-style '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"font-size") == 0)
{
svg_info->pointsize=GetUserSpaceCoordinateValue(svg_info,0,value);
- MVGPrintf(svg_info->file,"font-size %g\n",svg_info->pointsize);
+ (void) FormatLocaleFile(svg_info->file,"font-size %g\n",
+ svg_info->pointsize);
break;
}
if (LocaleCompare(keyword,"font-weight") == 0)
{
- MVGPrintf(svg_info->file,"font-weight '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"font-weight '%s'\n",
+ value);
break;
}
break;
@@ -1301,27 +1301,27 @@
{
p=(const char *) value;
GetMagickToken(p,&p,token);
- affine.sx=StringToDouble(value,(char **) NULL);
+ affine.sx=LocaleToDouble(value,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.rx=StringToDouble(token,(char **) NULL);
+ affine.rx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.ry=StringToDouble(token,(char **) NULL);
+ affine.ry=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.sy=StringToDouble(token,(char **) NULL);
+ affine.sy=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.tx=StringToDouble(token,(char **) NULL);
+ affine.tx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.ty=StringToDouble(token,(char **) NULL);
+ affine.ty=LocaleToDouble(token,(char **) NULL);
break;
}
break;
@@ -1410,7 +1410,7 @@
transform.ty=affine.rx*current.tx+affine.sy*current.ty+
affine.ty;
}
- MVGPrintf(svg_info->file,
+ (void) FormatLocaleFile(svg_info->file,
"affine %g %g %g %g %g %g\n",transform.sx,
transform.rx,transform.ry,transform.sy,transform.tx,
transform.ty);
@@ -1422,7 +1422,8 @@
if (LocaleCompare(keyword,"gradientUnits") == 0)
{
(void) CloneString(&units,value);
- MVGPrintf(svg_info->file,"gradient-units '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"gradient-units '%s'\n",
+ value);
break;
}
break;
@@ -1470,7 +1471,7 @@
}
if (LocaleCompare(keyword,"opacity") == 0)
{
- MVGPrintf(svg_info->file,"opacity '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"opacity '%s'\n",value);
break;
}
break;
@@ -1507,11 +1508,11 @@
angle;
angle=GetUserSpaceCoordinateValue(svg_info,0,value);
- MVGPrintf(svg_info->file,"translate %g,%g\n",
+ (void) FormatLocaleFile(svg_info->file,"translate %g,%g\n",
svg_info->bounds.x,svg_info->bounds.y);
svg_info->bounds.x=0;
svg_info->bounds.y=0;
- MVGPrintf(svg_info->file,"rotate %g\n",angle);
+ (void) FormatLocaleFile(svg_info->file,"rotate %g\n",angle);
break;
}
if (LocaleCompare(keyword,"rx") == 0)
@@ -1548,51 +1549,57 @@
{
if (LocaleCompare(value,"currentColor") == 0)
{
- MVGPrintf(svg_info->file,"stroke '%s'\n",color);
+ (void) FormatLocaleFile(svg_info->file,"stroke '%s'\n",color);
break;
}
- MVGPrintf(svg_info->file,"stroke '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"stroke-antialiasing") == 0)
{
- MVGPrintf(svg_info->file,"stroke-antialias %d\n",
+ (void) FormatLocaleFile(svg_info->file,"stroke-antialias %d\n",
LocaleCompare(value,"true") == 0);
break;
}
if (LocaleCompare(keyword,"stroke-dasharray") == 0)
{
- MVGPrintf(svg_info->file,"stroke-dasharray %s\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke-dasharray %s\n",
+ value);
break;
}
if (LocaleCompare(keyword,"stroke-dashoffset") == 0)
{
- MVGPrintf(svg_info->file,"stroke-dashoffset %s\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke-dashoffset %s\n",
+ value);
break;
}
if (LocaleCompare(keyword,"stroke-linecap") == 0)
{
- MVGPrintf(svg_info->file,"stroke-linecap '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke-linecap '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"stroke-linejoin") == 0)
{
- MVGPrintf(svg_info->file,"stroke-linejoin '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke-linejoin '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"stroke-miterlimit") == 0)
{
- MVGPrintf(svg_info->file,"stroke-miterlimit '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke-miterlimit '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"stroke-opacity") == 0)
{
- MVGPrintf(svg_info->file,"stroke-opacity '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"stroke-opacity '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"stroke-width") == 0)
{
- MVGPrintf(svg_info->file,"stroke-width %g\n",
+ (void) FormatLocaleFile(svg_info->file,"stroke-width %g\n",
GetUserSpaceCoordinateValue(svg_info,1,value));
break;
}
@@ -1613,18 +1620,21 @@
{
if (LocaleCompare(keyword,"clip-path") == 0)
{
- MVGPrintf(svg_info->file,"clip-path '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "clip-path '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"clip-rule") == 0)
{
- MVGPrintf(svg_info->file,"clip-rule '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "clip-rule '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"clipPathUnits") == 0)
{
(void) CloneString(&units,value);
- MVGPrintf(svg_info->file,"clip-units '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "clip-units '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"color") == 0)
@@ -1641,56 +1651,66 @@
{
if (LocaleCompare(value,"currentColor") == 0)
{
- MVGPrintf(svg_info->file,"fill '%s'\n",color);
+ (void) FormatLocaleFile(svg_info->file,
+ "fill '%s'\n",color);
break;
}
if (LocaleCompare(value,"#00000000") == 0)
- MVGPrintf(svg_info->file,"fill '#000000'\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "fill '#000000'\n");
else
- MVGPrintf(svg_info->file,"fill '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"fillcolor") == 0)
{
- MVGPrintf(svg_info->file,"fill '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"fill-rule") == 0)
{
- MVGPrintf(svg_info->file,"fill-rule '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "fill-rule '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"fill-opacity") == 0)
{
- MVGPrintf(svg_info->file,"fill-opacity '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "fill-opacity '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"font-family") == 0)
{
- MVGPrintf(svg_info->file,"font-family '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "font-family '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"font-stretch") == 0)
{
- MVGPrintf(svg_info->file,"font-stretch '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "font-stretch '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"font-style") == 0)
{
- MVGPrintf(svg_info->file,"font-style '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "font-style '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"font-size") == 0)
{
svg_info->pointsize=GetUserSpaceCoordinateValue(
svg_info,0,value);
- MVGPrintf(svg_info->file,"font-size %g\n",
+ (void) FormatLocaleFile(svg_info->file,"font-size %g\n",
svg_info->pointsize);
break;
}
if (LocaleCompare(keyword,"font-weight") == 0)
{
- MVGPrintf(svg_info->file,"font-weight '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "font-weight '%s'\n",value);
break;
}
break;
@@ -1700,13 +1720,14 @@
{
if (LocaleCompare(keyword,"offset") == 0)
{
- MVGPrintf(svg_info->file,"offset %g\n",
+ (void) FormatLocaleFile(svg_info->file,"offset %g\n",
GetUserSpaceCoordinateValue(svg_info,1,value));
break;
}
if (LocaleCompare(keyword,"opacity") == 0)
{
- MVGPrintf(svg_info->file,"opacity '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "opacity '%s'\n",value);
break;
}
break;
@@ -1723,57 +1744,68 @@
{
if (LocaleCompare(value,"currentColor") == 0)
{
- MVGPrintf(svg_info->file,"stroke '%s'\n",color);
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke '%s'\n",color);
break;
}
if (LocaleCompare(value,"#00000000") == 0)
- MVGPrintf(svg_info->file,"fill '#000000'\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "fill '#000000'\n");
else
- MVGPrintf(svg_info->file,"stroke '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"stroke-antialiasing") == 0)
{
- MVGPrintf(svg_info->file,"stroke-antialias %d\n",
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-antialias %d\n",
LocaleCompare(value,"true") == 0);
break;
}
if (LocaleCompare(keyword,"stroke-dasharray") == 0)
{
- MVGPrintf(svg_info->file,"stroke-dasharray %s\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-dasharray %s\n",value);
break;
}
if (LocaleCompare(keyword,"stroke-dashoffset") == 0)
{
- MVGPrintf(svg_info->file,"stroke-dashoffset %s\n",
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-dashoffset %s\n",
value);
break;
}
if (LocaleCompare(keyword,"stroke-linecap") == 0)
{
- MVGPrintf(svg_info->file,"stroke-linecap '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-linecap '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"stroke-linejoin") == 0)
{
- MVGPrintf(svg_info->file,"stroke-linejoin '%s'\n",
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-linejoin '%s'\n",
value);
break;
}
if (LocaleCompare(keyword,"stroke-miterlimit") == 0)
{
- MVGPrintf(svg_info->file,"stroke-miterlimit '%s'\n",
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-miterlimit '%s'\n",
value);
break;
}
if (LocaleCompare(keyword,"stroke-opacity") == 0)
{
- MVGPrintf(svg_info->file,"stroke-opacity '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-opacity '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"stroke-width") == 0)
{
- MVGPrintf(svg_info->file,"stroke-width %g\n",
+ (void) FormatLocaleFile(svg_info->file,
+ "stroke-width %g\n",
GetUserSpaceCoordinateValue(svg_info,1,value));
break;
}
@@ -1784,27 +1816,33 @@
{
if (LocaleCompare(keyword,"text-align") == 0)
{
- MVGPrintf(svg_info->file,"text-align '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "text-align '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"text-anchor") == 0)
{
- MVGPrintf(svg_info->file,"text-anchor '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,
+ "text-anchor '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"text-decoration") == 0)
{
if (LocaleCompare(value,"underline") == 0)
- MVGPrintf(svg_info->file,"decorate underline\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "decorate underline\n");
if (LocaleCompare(value,"line-through") == 0)
- MVGPrintf(svg_info->file,"decorate line-through\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "decorate line-through\n");
if (LocaleCompare(value,"overline") == 0)
- MVGPrintf(svg_info->file,"decorate overline\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "decorate overline\n");
break;
}
if (LocaleCompare(keyword,"text-antialiasing") == 0)
{
- MVGPrintf(svg_info->file,"text-antialias %d\n",
+ (void) FormatLocaleFile(svg_info->file,
+ "text-antialias %d\n",
LocaleCompare(value,"true") == 0);
break;
}
@@ -1826,27 +1864,30 @@
{
if (LocaleCompare(keyword,"text-align") == 0)
{
- MVGPrintf(svg_info->file,"text-align '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"text-align '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"text-anchor") == 0)
{
- MVGPrintf(svg_info->file,"text-anchor '%s'\n",value);
+ (void) FormatLocaleFile(svg_info->file,"text-anchor '%s'\n",
+ value);
break;
}
if (LocaleCompare(keyword,"text-decoration") == 0)
{
if (LocaleCompare(value,"underline") == 0)
- MVGPrintf(svg_info->file,"decorate underline\n");
+ (void) FormatLocaleFile(svg_info->file,"decorate underline\n");
if (LocaleCompare(value,"line-through") == 0)
- MVGPrintf(svg_info->file,"decorate line-through\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "decorate line-through\n");
if (LocaleCompare(value,"overline") == 0)
- MVGPrintf(svg_info->file,"decorate overline\n");
+ (void) FormatLocaleFile(svg_info->file,"decorate overline\n");
break;
}
if (LocaleCompare(keyword,"text-antialiasing") == 0)
{
- MVGPrintf(svg_info->file,"text-antialias %d\n",
+ (void) FormatLocaleFile(svg_info->file,"text-antialias %d\n",
LocaleCompare(value,"true") == 0);
break;
}
@@ -1877,27 +1918,27 @@
{
p=(const char *) value;
GetMagickToken(p,&p,token);
- affine.sx=StringToDouble(value,(char **) NULL);
+ affine.sx=LocaleToDouble(value,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.rx=StringToDouble(token,(char **) NULL);
+ affine.rx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.ry=StringToDouble(token,(char **) NULL);
+ affine.ry=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.sy=StringToDouble(token,(char **) NULL);
+ affine.sy=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.tx=StringToDouble(token,(char **) NULL);
+ affine.tx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- affine.ty=StringToDouble(token,(char **) NULL);
+ affine.ty=LocaleToDouble(token,(char **) NULL);
break;
}
break;
@@ -1914,15 +1955,15 @@
p=(const char *) value;
GetMagickToken(p,&p,token);
- angle=StringToDouble(value,(char **) NULL);
+ angle=LocaleToDouble(value,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- x=StringToDouble(token,(char **) NULL);
+ x=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- y=StringToDouble(token,(char **) NULL);
+ y=LocaleToDouble(token,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
@@ -2002,7 +2043,7 @@
transform.ty=affine.rx*current.tx+affine.sy*current.ty+
affine.ty;
}
- MVGPrintf(svg_info->file,
+ (void) FormatLocaleFile(svg_info->file,
"affine %g %g %g %g %g %g\n",transform.sx,
transform.rx,transform.ry,transform.sy,transform.tx,
transform.ty);
@@ -2025,21 +2066,21 @@
{
p=(const char *) value;
GetMagickToken(p,&p,token);
- svg_info->view_box.x=StringToDouble(token,(char **) NULL);
+ svg_info->view_box.x=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- svg_info->view_box.y=StringToDouble(token,(char **) NULL);
+ svg_info->view_box.y=LocaleToDouble(token,(char **) NULL);
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- svg_info->view_box.width=StringToDouble(token,(char **) NULL);
+ svg_info->view_box.width=LocaleToDouble(token,(char **) NULL);
if (svg_info->bounds.width == 0)
svg_info->bounds.width=svg_info->view_box.width;
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- svg_info->view_box.height=StringToDouble(token,(char **) NULL);
+ svg_info->view_box.height=LocaleToDouble(token,(char **) NULL);
if (svg_info->bounds.height == 0)
svg_info->bounds.height=svg_info->view_box.height;
break;
@@ -2113,7 +2154,7 @@
if (LocaleCompare((const char *) name,"svg") == 0)
{
if (svg_info->document->encoding != (const xmlChar *) NULL)
- MVGPrintf(svg_info->file,"encoding \"%s\"\n",
+ (void) FormatLocaleFile(svg_info->file,"encoding \"%s\"\n",
(const char *) svg_info->document->encoding);
if (attributes != (const xmlChar **) NULL)
{
@@ -2126,11 +2167,12 @@
svg_info->view_box=svg_info->bounds;
svg_info->width=(size_t) floor(svg_info->bounds.width+0.5);
svg_info->height=(size_t) floor(svg_info->bounds.height+0.5);
- MVGPrintf(svg_info->file,"viewbox 0 0 %.20g %.20g\n",(double)
- svg_info->width,(double) svg_info->height);
+ (void) FormatLocaleFile(svg_info->file,"viewbox 0 0 %.20g %.20g\n",
+ (double) svg_info->width,(double) svg_info->height);
sx=(double) svg_info->width/svg_info->view_box.width;
sy=(double) svg_info->height/svg_info->view_box.height;
- MVGPrintf(svg_info->file,"affine %g 0 0 %g 0.0 0.0\n",sx,sy);
+ (void) FormatLocaleFile(svg_info->file,"affine %g 0 0 %g 0.0 0.0\n",
+ sx,sy);
}
}
(void) LogMagickEvent(CoderEvent,GetMagickModule()," )");
@@ -2165,15 +2207,15 @@
{
if (LocaleCompare((const char *) name,"circle") == 0)
{
- MVGPrintf(svg_info->file,"circle %g,%g %g,%g\n",
+ (void) FormatLocaleFile(svg_info->file,"circle %g,%g %g,%g\n",
svg_info->element.cx,svg_info->element.cy,svg_info->element.cx,
svg_info->element.cy+svg_info->element.minor);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"clipPath") == 0)
{
- MVGPrintf(svg_info->file,"pop clip-path\n");
+ (void) FormatLocaleFile(svg_info->file,"pop clip-path\n");
break;
}
break;
@@ -2183,7 +2225,7 @@
{
if (LocaleCompare((const char *) name,"defs") == 0)
{
- MVGPrintf(svg_info->file,"pop defs\n");
+ (void) FormatLocaleFile(svg_info->file,"pop defs\n");
break;
}
if (LocaleCompare((const char *) name,"desc") == 0)
@@ -2215,11 +2257,11 @@
angle;
angle=svg_info->element.angle;
- MVGPrintf(svg_info->file,"ellipse %g,%g %g,%g 0,360\n",
+ (void) FormatLocaleFile(svg_info->file,"ellipse %g,%g %g,%g 0,360\n",
svg_info->element.cx,svg_info->element.cy,
angle == 0.0 ? svg_info->element.major : svg_info->element.minor,
angle == 0.0 ? svg_info->element.minor : svg_info->element.major);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
break;
@@ -2229,7 +2271,7 @@
{
if (LocaleCompare((const char *) name,"g") == 0)
{
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
break;
@@ -2239,10 +2281,11 @@
{
if (LocaleCompare((const char *) name,"image") == 0)
{
- MVGPrintf(svg_info->file,"image Over %g,%g %g,%g '%s'\n",
- svg_info->bounds.x,svg_info->bounds.y,svg_info->bounds.width,
- svg_info->bounds.height,svg_info->url);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,
+ "image Over %g,%g %g,%g '%s'\n",svg_info->bounds.x,
+ svg_info->bounds.y,svg_info->bounds.width,svg_info->bounds.height,
+ svg_info->url);
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
break;
@@ -2252,15 +2295,15 @@
{
if (LocaleCompare((const char *) name,"line") == 0)
{
- MVGPrintf(svg_info->file,"line %g,%g %g,%g\n",
+ (void) FormatLocaleFile(svg_info->file,"line %g,%g %g,%g\n",
svg_info->segment.x1,svg_info->segment.y1,svg_info->segment.x2,
svg_info->segment.y2);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"linearGradient") == 0)
{
- MVGPrintf(svg_info->file,"pop gradient\n");
+ (void) FormatLocaleFile(svg_info->file,"pop gradient\n");
break;
}
break;
@@ -2270,25 +2313,28 @@
{
if (LocaleCompare((const char *) name,"pattern") == 0)
{
- MVGPrintf(svg_info->file,"pop pattern\n");
+ (void) FormatLocaleFile(svg_info->file,"pop pattern\n");
break;
}
if (LocaleCompare((const char *) name,"path") == 0)
{
- MVGPrintf(svg_info->file,"path '%s'\n",svg_info->vertices);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"path '%s'\n",
+ svg_info->vertices);
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"polygon") == 0)
{
- MVGPrintf(svg_info->file,"polygon %s\n",svg_info->vertices);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"polygon %s\n",
+ svg_info->vertices);
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"polyline") == 0)
{
- MVGPrintf(svg_info->file,"polyline %s\n",svg_info->vertices);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"polyline %s\n",
+ svg_info->vertices);
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
break;
@@ -2298,32 +2344,32 @@
{
if (LocaleCompare((const char *) name,"radialGradient") == 0)
{
- MVGPrintf(svg_info->file,"pop gradient\n");
+ (void) FormatLocaleFile(svg_info->file,"pop gradient\n");
break;
}
if (LocaleCompare((const char *) name,"rect") == 0)
{
if ((svg_info->radius.x == 0.0) && (svg_info->radius.y == 0.0))
{
- MVGPrintf(svg_info->file,"rectangle %g,%g %g,%g\n",
+ (void) FormatLocaleFile(svg_info->file,"rectangle %g,%g %g,%g\n",
svg_info->bounds.x,svg_info->bounds.y,
svg_info->bounds.x+svg_info->bounds.width,
svg_info->bounds.y+svg_info->bounds.height);
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (svg_info->radius.x == 0.0)
svg_info->radius.x=svg_info->radius.y;
if (svg_info->radius.y == 0.0)
svg_info->radius.y=svg_info->radius.x;
- MVGPrintf(svg_info->file,
+ (void) FormatLocaleFile(svg_info->file,
"roundRectangle %g,%g %g,%g %g,%g\n",
svg_info->bounds.x,svg_info->bounds.y,svg_info->bounds.x+
svg_info->bounds.width,svg_info->bounds.y+svg_info->bounds.height,
svg_info->radius.x,svg_info->radius.y);
svg_info->radius.x=0.0;
svg_info->radius.y=0.0;
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
break;
@@ -2333,13 +2379,13 @@
{
if (LocaleCompare((const char *) name,"stop") == 0)
{
- MVGPrintf(svg_info->file,"stop-color '%s' %s\n",svg_info->stop_color,
- svg_info->offset);
+ (void) FormatLocaleFile(svg_info->file,"stop-color '%s' %s\n",
+ svg_info->stop_color,svg_info->offset);
break;
}
if (LocaleCompare((const char *) name,"svg") == 0)
{
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
break;
@@ -2355,13 +2401,13 @@
*text;
text=EscapeString(svg_info->text,'\'');
- MVGPrintf(svg_info->file,"text %g,%g '%s'\n",
+ (void) FormatLocaleFile(svg_info->file,"text %g,%g '%s'\n",
svg_info->bounds.x-svg_info->center.x,svg_info->bounds.y-
svg_info->center.y,text);
text=DestroyString(text);
*svg_info->text='\0';
}
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"tspan") == 0)
@@ -2378,7 +2424,7 @@
*text;
text=EscapeString(svg_info->text,'\'');
- MVGPrintf(svg_info->file,"text %g,%g '%s'\n",
+ (void) FormatLocaleFile(svg_info->file,"text %g,%g '%s'\n",
svg_info->bounds.x,svg_info->bounds.y,text);
text=DestroyString(text);
draw_info=CloneDrawInfo(svg_info->image_info,(DrawInfo *) NULL);
@@ -2390,7 +2436,7 @@
draw_info=DestroyDrawInfo(draw_info);
*svg_info->text='\0';
}
- MVGPrintf(svg_info->file,"pop graphic-context\n");
+ (void) FormatLocaleFile(svg_info->file,"pop graphic-context\n");
break;
}
if (LocaleCompare((const char *) name,"title") == 0)
@@ -3017,7 +3063,7 @@
SetImageInfoBlob(read_info,(void *) NULL,0);
if (read_info->density != (char *) NULL)
read_info->density=DestroyString(read_info->density);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"mvg:%s",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"mvg:%s",
filename);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
@@ -3078,7 +3124,7 @@
#endif
#if defined(MAGICKCORE_RSVG_DELEGATE)
rsvg_init();
- (void) FormatMagickString(version,MaxTextExtent,"RSVG %d.%d.%d",
+ (void) FormatLocaleString(version,MaxTextExtent,"RSVG %d.%d.%d",
LIBRSVG_MAJOR_VERSION,LIBRSVG_MINOR_VERSION,LIBRSVG_MICRO_VERSION);
#endif
entry=SetMagickInfo("SVG");
@@ -3192,7 +3238,7 @@
(void) WriteBlobString(image,"\">\n");
return;
}
- (void) FormatMagickString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MaxTextExtent,
"\" transform=\"scale(%g,%g)\">\n",affine->sx,affine->sy);
(void) WriteBlobString(image,transform);
return;
@@ -3208,7 +3254,7 @@
theta;
theta=(180.0/MagickPI)*atan2(affine->rx,affine->sx);
- (void) FormatMagickString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MaxTextExtent,
"\" transform=\"rotate(%g)\">\n",theta);
(void) WriteBlobString(image,transform);
return;
@@ -3222,13 +3268,13 @@
(fabs(affine->ry) < MagickEpsilon) &&
(fabs(affine->sy-1.0) < MagickEpsilon))
{
- (void) FormatMagickString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MaxTextExtent,
"\" transform=\"translate(%g,%g)\">\n",affine->tx,affine->ty);
(void) WriteBlobString(image,transform);
return;
}
}
- (void) FormatMagickString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MaxTextExtent,
"\" transform=\"matrix(%g %g %g %g %g %g)\">\n",
affine->sx,affine->rx,affine->ry,affine->sy,affine->tx,affine->ty);
(void) WriteBlobString(image,transform);
@@ -3338,7 +3384,7 @@
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n");
(void) WriteBlobString(image,
" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n");
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"<svg width=\"%.20g\" height=\"%.20g\">\n",(double) image->columns,
(double) image->rows);
(void) WriteBlobString(image,message);
@@ -3354,7 +3400,7 @@
SetMagickPixelPacket(image,p,indexes+x,&pixel);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
&image->exception);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",
(double) x,(double) y,tuple);
(void) WriteBlobString(image,message);
@@ -3450,7 +3496,7 @@
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n");
(void) WriteBlobString(image,
" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n");
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"<svg width=\"%.20g\" height=\"%.20g\">\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,message);
@@ -3509,34 +3555,34 @@
if (LocaleCompare("affine",keyword) == 0)
{
GetMagickToken(q,&q,token);
- affine.sx=StringToDouble(token,(char **) NULL);
+ affine.sx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.rx=StringToDouble(token,(char **) NULL);
+ affine.rx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.ry=StringToDouble(token,(char **) NULL);
+ affine.ry=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.sy=StringToDouble(token,(char **) NULL);
+ affine.sy=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.tx=StringToDouble(token,(char **) NULL);
+ affine.tx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.ty=StringToDouble(token,(char **) NULL);
+ affine.ty=LocaleToDouble(token,(char **) NULL);
break;
}
if (LocaleCompare("angle",keyword) == 0)
{
GetMagickToken(q,&q,token);
- affine.rx=StringToDouble(token,(char **) NULL);
- affine.ry=StringToDouble(token,(char **) NULL);
+ affine.rx=LocaleToDouble(token,(char **) NULL);
+ affine.ry=LocaleToDouble(token,(char **) NULL);
break;
}
if (LocaleCompare("arc",keyword) == 0)
@@ -3564,7 +3610,7 @@
if (LocaleCompare("clip-path",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"clip-path:url(#%s);",token);
(void) WriteBlobString(image,message);
break;
@@ -3572,7 +3618,7 @@
if (LocaleCompare("clip-rule",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"clip-rule:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3580,7 +3626,7 @@
if (LocaleCompare("clip-units",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"clipPathUnits=%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3604,7 +3650,7 @@
if (LocaleCompare("decorate",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"text-decoration:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3629,7 +3675,7 @@
if (LocaleCompare("fill",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"fill:%s;",
+ (void) FormatLocaleString(message,MaxTextExtent,"fill:%s;",
token);
(void) WriteBlobString(image,message);
break;
@@ -3637,7 +3683,7 @@
if (LocaleCompare("fill-rule",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"fill-rule:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3645,7 +3691,7 @@
if (LocaleCompare("fill-opacity",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"fill-opacity:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3653,7 +3699,7 @@
if (LocaleCompare("font-family",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"font-family:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3661,7 +3707,7 @@
if (LocaleCompare("font-stretch",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"font-stretch:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3669,7 +3715,7 @@
if (LocaleCompare("font-style",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"font-style:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3677,7 +3723,7 @@
if (LocaleCompare("font-size",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"font-size:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3685,7 +3731,7 @@
if (LocaleCompare("font-weight",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"font-weight:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3704,7 +3750,7 @@
if (LocaleCompare("text-align",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"text-align %s ",token);
(void) WriteBlobString(image,message);
break;
@@ -3712,7 +3758,7 @@
if (LocaleCompare("text-anchor",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"text-anchor %s ",token);
(void) WriteBlobString(image,message);
break;
@@ -3760,7 +3806,7 @@
if (LocaleCompare("opacity",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"opacity %s ",
+ (void) FormatLocaleString(message,MaxTextExtent,"opacity %s ",
token);
(void) WriteBlobString(image,message);
break;
@@ -3806,7 +3852,7 @@
}
if (LocaleCompare("gradient",token) == 0)
{
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"</%sGradient>\n",type);
(void) WriteBlobString(image,message);
break;
@@ -3834,7 +3880,7 @@
if (LocaleCompare("clip-path",token) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"<clipPath id=\"%s\">\n",token);
(void) WriteBlobString(image,message);
break;
@@ -3851,24 +3897,24 @@
GetMagickToken(q,&q,token);
(void) CopyMagickString(type,token,MaxTextExtent);
GetMagickToken(q,&q,token);
- svg_info.segment.x1=StringToDouble(token,(char **) NULL);
- svg_info.element.cx=StringToDouble(token,(char **) NULL);
+ svg_info.segment.x1=LocaleToDouble(token,(char **) NULL);
+ svg_info.element.cx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.segment.y1=StringToDouble(token,(char **) NULL);
- svg_info.element.cy=StringToDouble(token,(char **) NULL);
+ svg_info.segment.y1=LocaleToDouble(token,(char **) NULL);
+ svg_info.element.cy=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.segment.x2=StringToDouble(token,(char **) NULL);
- svg_info.element.major=StringToDouble(token,(char **) NULL);
+ svg_info.segment.x2=LocaleToDouble(token,(char **) NULL);
+ svg_info.element.major=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.segment.y2=StringToDouble(token,(char **) NULL);
- svg_info.element.minor=StringToDouble(token,(char **) NULL);
- (void) FormatMagickString(message,MaxTextExtent,
+ svg_info.segment.y2=LocaleToDouble(token,(char **) NULL);
+ svg_info.element.minor=LocaleToDouble(token,(char **) NULL);
+ (void) FormatLocaleString(message,MaxTextExtent,
"<%sGradient id=\"%s\" x1=\"%g\" y1=\"%g\" x2=\"%g\" "
"y2=\"%g\">\n",type,name,svg_info.segment.x1,
svg_info.segment.y1,svg_info.segment.x2,svg_info.segment.y2);
@@ -3877,8 +3923,8 @@
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.element.angle=StringToDouble(token,(char **) NULL);
- (void) FormatMagickString(message,MaxTextExtent,
+ svg_info.element.angle=LocaleToDouble(token,(char **) NULL);
+ (void) FormatLocaleString(message,MaxTextExtent,
"<%sGradient id=\"%s\" cx=\"%g\" cy=\"%g\" r=\"%g\" "
"fx=\"%g\" fy=\"%g\">\n",type,name,
svg_info.element.cx,svg_info.element.cy,
@@ -3904,20 +3950,20 @@
GetMagickToken(q,&q,token);
(void) CopyMagickString(name,token,MaxTextExtent);
GetMagickToken(q,&q,token);
- svg_info.bounds.x=StringToDouble(token,(char **) NULL);
+ svg_info.bounds.x=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.bounds.y=StringToDouble(token,(char **) NULL);
+ svg_info.bounds.y=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.bounds.width=StringToDouble(token,(char **) NULL);
+ svg_info.bounds.width=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- svg_info.bounds.height=StringToDouble(token,(char **) NULL);
- (void) FormatMagickString(message,MaxTextExtent,
+ svg_info.bounds.height=LocaleToDouble(token,(char **) NULL);
+ (void) FormatLocaleString(message,MaxTextExtent,
"<pattern id=\"%s\" x=\"%g\" y=\"%g\" width=\"%g\" "
"height=\"%g\">\n",name,svg_info.bounds.x,
svg_info.bounds.y,svg_info.bounds.width,
@@ -3946,7 +3992,7 @@
if (LocaleCompare("rotate",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"rotate(%s) ",
+ (void) FormatLocaleString(message,MaxTextExtent,"rotate(%s) ",
token);
(void) WriteBlobString(image,message);
break;
@@ -3960,17 +4006,17 @@
if (LocaleCompare("scale",keyword) == 0)
{
GetMagickToken(q,&q,token);
- affine.sx=StringToDouble(token,(char **) NULL);
+ affine.sx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.sy=StringToDouble(token,(char **) NULL);
+ affine.sy=LocaleToDouble(token,(char **) NULL);
break;
}
if (LocaleCompare("skewX",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"skewX(%s) ",
+ (void) FormatLocaleString(message,MaxTextExtent,"skewX(%s) ",
token);
(void) WriteBlobString(image,message);
break;
@@ -3978,7 +4024,7 @@
if (LocaleCompare("skewY",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"skewY(%s) ",
+ (void) FormatLocaleString(message,MaxTextExtent,"skewY(%s) ",
token);
(void) WriteBlobString(image,message);
break;
@@ -3991,7 +4037,7 @@
GetMagickToken(q,&q,token);
(void) CopyMagickString(color,token,MaxTextExtent);
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <stop offset=\"%s\" stop-color=\"%s\" />\n",token,color);
(void) WriteBlobString(image,message);
break;
@@ -3999,7 +4045,7 @@
if (LocaleCompare("stroke",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"stroke:%s;",
+ (void) FormatLocaleString(message,MaxTextExtent,"stroke:%s;",
token);
(void) WriteBlobString(image,message);
break;
@@ -4007,7 +4053,7 @@
if (LocaleCompare("stroke-antialias",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-antialias:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4027,7 +4073,7 @@
for (j=0; j < k; j++)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,"%s ",
+ (void) FormatLocaleString(message,MaxTextExtent,"%s ",
token);
(void) WriteBlobString(image,message);
}
@@ -4035,7 +4081,7 @@
break;
}
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-dasharray:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4043,7 +4089,7 @@
if (LocaleCompare("stroke-dashoffset",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-dashoffset:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4051,7 +4097,7 @@
if (LocaleCompare("stroke-linecap",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-linecap:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4059,7 +4105,7 @@
if (LocaleCompare("stroke-linejoin",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-linejoin:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4067,7 +4113,7 @@
if (LocaleCompare("stroke-miterlimit",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-miterlimit:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4075,7 +4121,7 @@
if (LocaleCompare("stroke-opacity",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-opacity:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4083,7 +4129,7 @@
if (LocaleCompare("stroke-width",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"stroke-width:%s;",token);
(void) WriteBlobString(image,message);
continue;
@@ -4102,7 +4148,7 @@
if (LocaleCompare("text-antialias",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
"text-antialias:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4115,11 +4161,11 @@
if (LocaleCompare("translate",keyword) == 0)
{
GetMagickToken(q,&q,token);
- affine.tx=StringToDouble(token,(char **) NULL);
+ affine.tx=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- affine.ty=StringToDouble(token,(char **) NULL);
+ affine.ty=LocaleToDouble(token,(char **) NULL);
break;
}
status=MagickFalse;
@@ -4168,11 +4214,11 @@
if (IsPoint(q) == MagickFalse)
break;
GetMagickToken(q,&q,token);
- point.x=StringToDouble(token,(char **) NULL);
+ point.x=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- point.y=StringToDouble(token,(char **) NULL);
+ point.y=LocaleToDouble(token,(char **) NULL);
GetMagickToken(q,(const char **) NULL,token);
if (*token == ',')
GetMagickToken(q,&q,token);
@@ -4222,7 +4268,7 @@
status=MagickFalse;
break;
}
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <line x1=\"%g\" y1=\"%g\" x2=\"%g\" y2=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
primitive_info[j+1].point.x,primitive_info[j+1].point.y);
@@ -4236,7 +4282,7 @@
status=MagickFalse;
break;
}
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <rect x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
primitive_info[j+1].point.x-primitive_info[j].point.x,
@@ -4251,7 +4297,7 @@
status=MagickFalse;
break;
}
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <rect x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\" rx=\"%g\" "
"ry=\"%g\"/>\n",primitive_info[j].point.x,
primitive_info[j].point.y,primitive_info[j+1].point.x-
@@ -4277,7 +4323,7 @@
status=MagickFalse;
break;
}
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <ellipse cx=\"%g\" cy=\"%g\" rx=\"%g\" ry=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
primitive_info[j+1].point.x,primitive_info[j+1].point.y);
@@ -4297,7 +4343,7 @@
}
alpha=primitive_info[j+1].point.x-primitive_info[j].point.x;
beta=primitive_info[j+1].point.y-primitive_info[j].point.y;
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <circle cx=\"%g\" cy=\"%g\" r=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
hypot(alpha,beta));
@@ -4316,7 +4362,7 @@
length=strlen(message);
for ( ; j < i; j++)
{
- (void) FormatMagickString(message,MaxTextExtent,"%g,%g ",
+ (void) FormatLocaleString(message,MaxTextExtent,"%g,%g ",
primitive_info[j].point.x,primitive_info[j].point.y);
length+=strlen(message);
if (length >= 80)
@@ -4345,7 +4391,7 @@
length=strlen(message);
for ( ; j < i; j++)
{
- (void) FormatMagickString(message,MaxTextExtent,"%g,%g ",
+ (void) FormatLocaleString(message,MaxTextExtent,"%g,%g ",
primitive_info[j].point.x,primitive_info[j].point.y);
length+=strlen(message);
if (length >= 80)
@@ -4427,7 +4473,7 @@
break;
}
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <text x=\"%g\" y=\"%g\">",primitive_info[j].point.x,
primitive_info[j].point.y);
(void) WriteBlobString(image,message);
@@ -4450,7 +4496,7 @@
break;
}
GetMagickToken(q,&q,token);
- (void) FormatMagickString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MaxTextExtent,
" <image x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\" "
"xlink:href=\"%s\"/>\n",primitive_info[j].point.x,
primitive_info[j].point.y,primitive_info[j+1].point.x,
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index 1f16349..7e1a06e 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -209,7 +209,7 @@
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,&image->exception);
if (LocaleCompare(write_info->magick,"THUMBNAIL") == 0)
- (void) FormatMagickString(thumbnail_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(thumbnail_image->filename,MaxTextExtent,
"miff:%s",write_info->filename);
status=WriteImage(write_info,thumbnail_image);
thumbnail_image=DestroyImage(thumbnail_image);
diff --git a/coders/tiff.c b/coders/tiff.c
index d2d6928..2cf1835 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -371,7 +371,7 @@
Read TIFF image.
*/
read_info=CloneImageInfo((ImageInfo *) NULL);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"%s",filename);
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s",filename);
image=ReadTIFFImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
@@ -604,7 +604,7 @@
shorty;
if (TIFFGetField(tiff,exif_info[i].tag,&shorty) != 0)
- (void) FormatMagickString(value,MaxTextExtent,"%d",shorty);
+ (void) FormatLocaleString(value,MaxTextExtent,"%d",shorty);
break;
}
case TIFF_LONG:
@@ -613,7 +613,7 @@
ssize_ty;
if (TIFFGetField(tiff,exif_info[i].tag,&ssize_ty) != 0)
- (void) FormatMagickString(value,MaxTextExtent,"%d",ssize_ty);
+ (void) FormatLocaleString(value,MaxTextExtent,"%d",ssize_ty);
break;
}
case TIFF_RATIONAL:
@@ -623,7 +623,7 @@
rational;
if (TIFFGetField(tiff,exif_info[i].tag,&rational) != 0)
- (void) FormatMagickString(value,MaxTextExtent,"%g",rational);
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",rational);
break;
}
default:
@@ -1017,7 +1017,7 @@
(void) TIFFGetFieldDefaulted(tiff,TIFFTAG_YCBCRSUBSAMPLING,
&horizontal,&vertical);
- (void) FormatMagickString(sampling_factor,MaxTextExtent,"%dx%d",
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%dx%d",
horizontal,vertical);
(void) SetImageProperty(image,"jpeg:sampling-factor",
sampling_factor);
@@ -1132,7 +1132,7 @@
value[MaxTextExtent];
method=ReadStripMethod;
- (void) FormatMagickString(value,MaxTextExtent,"%u",
+ (void) FormatLocaleString(value,MaxTextExtent,"%u",
(unsigned int) rows_per_strip);
(void) SetImageProperty(image,"tiff:rows-per-strip",value);
}
@@ -1710,7 +1710,7 @@
UnlockSemaphoreInfo(tiff_semaphore);
*version='\0';
#if defined(TIFF_VERSION)
- (void) FormatMagickString(version,MaxTextExtent,"%d",TIFF_VERSION);
+ (void) FormatLocaleString(version,MaxTextExtent,"%d",TIFF_VERSION);
#endif
#if defined(MAGICKCORE_TIFF_DELEGATE)
{
@@ -1926,7 +1926,7 @@
"UnableToCreateTemporaryFile",filename);
return(MagickFalse);
}
- (void) FormatMagickString(huffman_image->filename,MaxTextExtent,"tiff:%s",
+ (void) FormatLocaleString(huffman_image->filename,MaxTextExtent,"tiff:%s",
filename);
(void) SetImageType(huffman_image,BilevelType);
write_info=CloneImageInfo((ImageInfo *) NULL);
@@ -2390,7 +2390,7 @@
float
rational;
- rational=StringToDouble(value,(char **) NULL);
+ rational=LocaleToDouble(value,(char **) NULL);
(void) TIFFSetField(tiff,exif_info[i].tag,rational);
break;
}
diff --git a/coders/ttf.c b/coders/ttf.c
index c3f8803..f213df7 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -249,29 +249,29 @@
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
draw_info->font=AcquireString(image->filename);
ConcatenateString(&draw_info->primitive,"push graphic-context\n");
- (void) FormatMagickString(buffer,MaxTextExtent," viewbox 0 0 %.20g %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent," viewbox 0 0 %.20g %.20g\n",
(double) image->columns,(double) image->rows);
ConcatenateString(&draw_info->primitive,buffer);
ConcatenateString(&draw_info->primitive," font-size 18\n");
- (void) FormatMagickString(buffer,MaxTextExtent," text 10,%.20g '",(double) y);
+ (void) FormatLocaleString(buffer,MaxTextExtent," text 10,%.20g '",(double) y);
ConcatenateString(&draw_info->primitive,buffer);
text=EscapeString(Text,'"');
ConcatenateString(&draw_info->primitive,text);
text=DestroyString(text);
- (void) FormatMagickString(buffer,MaxTextExtent,"'\n");
+ (void) FormatLocaleString(buffer,MaxTextExtent,"'\n");
ConcatenateString(&draw_info->primitive,buffer);
y+=20*(ssize_t) MultilineCensus((char *) Text)+20;
for (i=12; i <= 72; i+=6)
{
y+=i+12;
ConcatenateString(&draw_info->primitive," font-size 18\n");
- (void) FormatMagickString(buffer,MaxTextExtent," text 10,%.20g '%.20g'\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent," text 10,%.20g '%.20g'\n",
(double) y,(double) i);
ConcatenateString(&draw_info->primitive,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent," font-size %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent," font-size %.20g\n",
(double) i);
ConcatenateString(&draw_info->primitive,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent," text 50,%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent," text 50,%.20g "
"'That which does not destroy me, only makes me stronger.'\n",(double) y);
ConcatenateString(&draw_info->primitive,buffer);
if (i >= 24)
@@ -321,7 +321,7 @@
*version='\0';
#if defined(FREETYPE_MAJOR) && defined(FREETYPE_MINOR) && defined(FREETYPE_PATCH)
- (void) FormatMagickString(version,MaxTextExtent,"Freetype %d.%d.%d",
+ (void) FormatLocaleString(version,MaxTextExtent,"Freetype %d.%d.%d",
FREETYPE_MAJOR,FREETYPE_MINOR,FREETYPE_PATCH);
#endif
entry=SetMagickInfo("DFONT");
diff --git a/coders/txt.c b/coders/txt.c
index baa65d4..e14c09c 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -248,14 +248,14 @@
(void) SetImageBackgroundColor(image);
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
(void) CloneString(&draw_info->text,image_info->filename);
- (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+ (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
(long) page.y);
(void) CloneString(&draw_info->geometry,geometry);
status=GetTypeMetrics(image,draw_info,&metrics);
if (status == MagickFalse)
ThrowReaderException(TypeError,"UnableToGetTypeMetrics");
page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5);
- (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+ (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
(long) page.y);
(void) CloneString(&draw_info->geometry,geometry);
(void) CopyMagickString(filename,image_info->filename,MaxTextExtent);
@@ -659,7 +659,7 @@
image->depth=GetImageQuantumDepth(image,MagickTrue);
if (image->matte != MagickFalse)
(void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\n",(double)
image->columns,(double) image->rows,(double)
GetQuantumRange(image->depth),colorspace);
@@ -673,7 +673,7 @@
indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
SetMagickPixelPacket(image,p,indexes+x,&pixel);
@@ -697,7 +697,7 @@
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image," ");
GetColorTuple(&pixel,MagickTrue,tuple);
- (void) FormatMagickString(buffer,MaxTextExtent,"%s",tuple);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s",tuple);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image," ");
(void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
diff --git a/coders/uil.c b/coders/uil.c
index 937f9d1..bbc64f8 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -297,7 +297,7 @@
symbol=AcquireString("");
(void) WriteBlobString(image,"/* UIL */\n");
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"value\n %s_ct : color_table(\n",basename);
(void) WriteBlobString(image,buffer);
GetMagickPixelPacket(image,&pixel);
@@ -327,15 +327,15 @@
symbol[j]='\0';
(void) SubstituteString(&symbol,"'","''");
if (LocaleCompare(name,"None") == 0)
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" background color = '%s'",symbol);
else
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" color('%s',%s) = '%s'",name,
PixelIntensityToQuantum(image->colormap+i) <
((Quantum) QuantumRange/2) ? "background" : "foreground",symbol);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"%s",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s",
(i == (ssize_t) (colors-1) ? ");\n" : ",\n"));
(void) WriteBlobString(image,buffer);
}
@@ -343,7 +343,7 @@
Define UIL pixels.
*/
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
" %s_icon : icon(color_table = %s_ct,\n",basename,basename);
(void) WriteBlobString(image,buffer);
for (y=0; y < (ssize_t) image->rows; y++)
@@ -367,7 +367,7 @@
(void) WriteBlobString(image,buffer);
p++;
}
- (void) FormatMagickString(buffer,MaxTextExtent,"\"%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? ");" : ","));
(void) WriteBlobString(image,buffer);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/coders/vicar.c b/coders/vicar.c
index 77ad3aa..cb50c9f 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -458,7 +458,7 @@
Write header.
*/
(void) ResetMagickMemory(header,' ',MaxTextExtent);
- (void) FormatMagickString(header,MaxTextExtent,
+ (void) FormatLocaleString(header,MaxTextExtent,
"LBLSIZE=%.20g FORMAT='BYTE' TYPE='IMAGE' BUFSIZE=20000 DIM=2 EOL=0 "
"RECSIZE=%.20g ORG='BSQ' NL=%.20g NS=%.20g NB=1 N1=0 N2=0 N3=0 N4=0 NBB=0 "
"NLB=0 TASK='ImageMagick'",(double) MaxTextExtent,(double) image->columns,
diff --git a/coders/vid.c b/coders/vid.c
index fd7dcc0..9c65308 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -333,7 +333,7 @@
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,&image->exception);
if (LocaleCompare(write_info->magick,"VID") == 0)
- (void) FormatMagickString(montage_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(montage_image->filename,MaxTextExtent,
"miff:%s",write_info->filename);
status=WriteImage(write_info,montage_image);
montage_image=DestroyImage(montage_image);
diff --git a/coders/wmf.c b/coders/wmf.c
index 1a2f755..76e78a4 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -212,7 +212,7 @@
*/
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatMagickString(read_info->filename,MaxTextExtent,"eps:%s",
+ (void) FormatLocaleString(read_info->filename,MaxTextExtent,"eps:%s",
filename);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
diff --git a/coders/wpg.c b/coders/wpg.c
index 995d762..0d90e3a 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -619,7 +619,7 @@
return(-2);
break;
case 0x7E:
- (void) fprintf(stderr,"\nUnsupported WPG token XOR, please report!");
+ (void) FormatLocaleFile(stderr,"\nUnsupported WPG token XOR, please report!");
XorMe=!XorMe;
break;
case 0x7F:
@@ -639,7 +639,7 @@
RunCount=ReadBlobByte(image); /* RST */
if(x!=0)
{
- (void) fprintf(stderr,
+ (void) FormatLocaleFile(stderr,
"\nUnsupported WPG2 unaligned token RST x=%.20g, please report!\n"
,(double) x);
return(-3);
@@ -804,7 +804,7 @@
/* Read nested image */
/*FormatString(clone_info->filename,"%s:%s",magic_info->name,postscript_file);*/
- FormatMagickString(clone_info->filename,MaxTextExtent,"%s",postscript_file);
+ FormatLocaleString(clone_info->filename,MaxTextExtent,"%s",postscript_file);
image2=ReadImage(clone_info,exception);
if (!image2)
diff --git a/coders/xbm.c b/coders/xbm.c
index ce8a647..b7ef730 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -512,13 +512,13 @@
Write X bitmap header.
*/
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,"#define %s_width %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"#define %s_width %.20g\n",
basename,(double) image->columns);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"#define %s_height %.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"#define %s_height %.20g\n",
basename,(double) image->rows);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"static char %s_bits[] = {\n",basename);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
(void) CopyMagickString(buffer," ",MaxTextExtent);
@@ -550,7 +550,7 @@
/*
Write a bitmap byte to the image file.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"0x%02X, ",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",
(unsigned int) (byte & 0xff));
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count++;
@@ -571,7 +571,7 @@
Write a bitmap byte to the image file.
*/
byte>>=(8-bit);
- (void) FormatMagickString(buffer,MaxTextExtent,"0x%02X, ",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",
(unsigned int) (byte & 0xff));
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count++;
diff --git a/coders/xpm.c b/coders/xpm.c
index bb94c6c..caad028 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -734,11 +734,11 @@
*/
(void) WriteBlobString(image,"/* XPM */\n");
GetPathComponent(picon->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"static char *%s[] = {\n",basename);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"\"%.20g %.20g %.20g %.20g\",\n",(double) picon->columns,(double)
picon->rows,(double) colors,(double) characters_per_pixel);
(void) WriteBlobString(image,buffer);
@@ -770,7 +770,7 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) FormatMagickString(buffer,MaxTextExtent,"\"%s c %s\",\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s c %s\",\n",
symbol,name);
(void) WriteBlobString(image,buffer);
}
@@ -798,7 +798,7 @@
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
}
- (void) FormatMagickString(buffer,MaxTextExtent,"\"%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
y == (ssize_t) (picon->rows-1) ? "" : ",");
(void) WriteBlobString(image,buffer);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -960,7 +960,7 @@
GetPathComponent(image->filename,BasePath,basename);
if (isalnum((int) ((unsigned char) *basename)) == 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"xpm_%s",basename);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"xpm_%s",basename);
(void) CopyMagickString(basename,buffer,MaxTextExtent);
}
if (isalpha((int) ((unsigned char) basename[0])) == 0)
@@ -968,11 +968,11 @@
for (i=1; basename[i] != '\0'; i++)
if (isalnum((int) ((unsigned char) basename[i])) == 0)
basename[i]='_';
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"static char *%s[] = {\n",basename);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"\"%.20g %.20g %.20g %.20g \",\n",(double) image->columns,(double)
image->rows,(double) image->colors,(double) characters_per_pixel);
(void) WriteBlobString(image,buffer);
@@ -1001,7 +1001,7 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) FormatMagickString(buffer,MaxTextExtent,"\"%s c %s\",\n",symbol,
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s c %s\",\n",symbol,
name);
(void) WriteBlobString(image,buffer);
}
@@ -1029,7 +1029,7 @@
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
}
- (void) FormatMagickString(buffer,MaxTextExtent,"\"%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? "" : ","));
(void) WriteBlobString(image,buffer);
if (image->previous == (Image *) NULL)
diff --git a/coders/xps.c b/coders/xps.c
index 85c84dc..b64f371 100644
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -191,7 +191,7 @@
if ((flags & SigmaValue) == 0)
image->y_resolution=image->x_resolution;
}
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",
+ (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",
image->x_resolution,image->y_resolution);
/*
Determine page geometry from the XPS media box.
@@ -263,7 +263,7 @@
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
if (image_info->page != (char *) NULL)
(void) ParseAbsoluteGeometry(image_info->page,&page);
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
page.width,(double) page.height);
if (image_info->monochrome != MagickFalse)
delegate_info=GetDelegateInfo("xps:mono",(char *) NULL,exception);
@@ -282,7 +282,7 @@
page.width=(size_t) floor(page.width*image->y_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)
+ (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
@@ -290,10 +290,10 @@
if (read_info->number_scenes != 0)
{
if (read_info->number_scenes != 1)
- (void) FormatMagickString(options,MaxTextExtent,"-dLastPage=%.20g",
+ (void) FormatLocaleString(options,MaxTextExtent,"-dLastPage=%.20g",
(double) (read_info->scene+read_info->number_scenes));
else
- (void) FormatMagickString(options,MaxTextExtent,
+ (void) FormatLocaleString(options,MaxTextExtent,
"-dFirstPage=%.20g -dLastPage=%.20g",(double) read_info->scene+1,
(double) (read_info->scene+read_info->number_scenes));
read_info->number_scenes=0;
@@ -301,11 +301,11 @@
*read_info->scenes='\0';
}
if (read_info->authenticate != (char *) NULL)
- (void) FormatMagickString(options+strlen(options),MaxTextExtent,
+ (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
" -sXPSPassword=%s",read_info->authenticate);
(void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
(void) AcquireUniqueFilename(read_info->filename);
- (void) FormatMagickString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MaxTextExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,