diff --git a/wand/animate.c b/wand/animate.c
index bc97ada..9681961 100644
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -312,10 +312,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -1004,7 +1004,7 @@
i++;
if (i == (ssize_t) argc)
ThrowAnimateException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowAnimateInvalidArgumentException(option,argv[i]);
@@ -1367,10 +1367,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/wand/compare.c b/wand/compare.c
index a3685a4..413748e 100644
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -262,10 +262,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -531,7 +531,7 @@
if (*option == '+')
dissimilarity_threshold=DefaultDissimilarityThreshold;
else
- dissimilarity_threshold=StringToDouble(argv[i],(char **) NULL);
+ dissimilarity_threshold=LocaleToDouble(argv[i],(char **) NULL);
break;
}
if (LocaleCompare("duration",option+1) == 0)
@@ -661,7 +661,7 @@
i++;
if (i == (ssize_t) argc)
ThrowCompareException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowCompareInvalidArgumentException(option,argv[i]);
@@ -894,10 +894,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
@@ -1005,37 +1005,37 @@
case RootMeanSquaredErrorMetric:
case PeakAbsoluteErrorMetric:
{
- (void) fprintf(stderr,"%g (%g)",QuantumRange*distortion,
+ (void) FormatLocaleFile(stderr,"%g (%g)",QuantumRange*distortion,
(double) distortion);
if ((reconstruct_image->columns != image->columns) ||
(reconstruct_image->rows != image->rows))
- (void) fprintf(stderr," @ %.20g,%.20g",(double)
+ (void) FormatLocaleFile(stderr," @ %.20g,%.20g",(double)
difference_image->page.x,(double) difference_image->page.y);
- (void) fprintf(stderr,"\n");
+ (void) FormatLocaleFile(stderr,"\n");
break;
}
case AbsoluteErrorMetric:
case NormalizedCrossCorrelationErrorMetric:
case PeakSignalToNoiseRatioMetric:
{
- (void) fprintf(stderr,"%g",distortion);
+ (void) FormatLocaleFile(stderr,"%g",distortion);
if ((reconstruct_image->columns != image->columns) ||
(reconstruct_image->rows != image->rows))
- (void) fprintf(stderr," @ %.20g,%.20g",(double)
+ (void) FormatLocaleFile(stderr," @ %.20g,%.20g",(double)
difference_image->page.x,(double) difference_image->page.y);
- (void) fprintf(stderr,"\n");
+ (void) FormatLocaleFile(stderr,"\n");
break;
}
case MeanErrorPerPixelMetric:
{
- (void) fprintf(stderr,"%g (%g, %g)",distortion,
+ (void) FormatLocaleFile(stderr,"%g (%g, %g)",distortion,
image->error.normalized_mean_error,
image->error.normalized_maximum_error);
if ((reconstruct_image->columns != image->columns) ||
(reconstruct_image->rows != image->rows))
- (void) fprintf(stderr," @ %.20g,%.20g",(double)
+ (void) FormatLocaleFile(stderr," @ %.20g,%.20g",(double)
difference_image->page.x,(double) difference_image->page.y);
- (void) fprintf(stderr,"\n");
+ (void) FormatLocaleFile(stderr,"\n");
break;
}
case UndefinedMetric:
@@ -1049,12 +1049,12 @@
channel_distortion=GetImageChannelDistortions(image,reconstruct_image,
metric,&image->exception);
- (void) fprintf(stderr,"Image: %s\n",image->filename);
+ (void) FormatLocaleFile(stderr,"Image: %s\n",image->filename);
if ((reconstruct_image->columns != image->columns) ||
(reconstruct_image->rows != image->rows))
- (void) fprintf(stderr,"Offset: %.20g,%.20g\n",(double)
+ (void) FormatLocaleFile(stderr,"Offset: %.20g,%.20g\n",(double)
difference_image->page.x,(double) difference_image->page.y);
- (void) fprintf(stderr," Channel distortion: %s\n",
+ (void) FormatLocaleFile(stderr," Channel distortion: %s\n",
CommandOptionToMnemonic(MagickMetricOptions,(ssize_t) metric));
switch (metric)
{
@@ -1069,54 +1069,54 @@
case RGBColorspace:
default:
{
- (void) fprintf(stderr," red: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," red: %g (%g)\n",
QuantumRange*channel_distortion[RedChannel],
channel_distortion[RedChannel]);
- (void) fprintf(stderr," green: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," green: %g (%g)\n",
QuantumRange*channel_distortion[GreenChannel],
channel_distortion[GreenChannel]);
- (void) fprintf(stderr," blue: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," blue: %g (%g)\n",
QuantumRange*channel_distortion[BlueChannel],
channel_distortion[BlueChannel]);
if (image->matte != MagickFalse)
- (void) fprintf(stderr," alpha: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," alpha: %g (%g)\n",
QuantumRange*channel_distortion[OpacityChannel],
channel_distortion[OpacityChannel]);
break;
}
case CMYKColorspace:
{
- (void) fprintf(stderr," cyan: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," cyan: %g (%g)\n",
QuantumRange*channel_distortion[CyanChannel],
channel_distortion[CyanChannel]);
- (void) fprintf(stderr," magenta: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," magenta: %g (%g)\n",
QuantumRange*channel_distortion[MagentaChannel],
channel_distortion[MagentaChannel]);
- (void) fprintf(stderr," yellow: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," yellow: %g (%g)\n",
QuantumRange*channel_distortion[YellowChannel],
channel_distortion[YellowChannel]);
- (void) fprintf(stderr," black: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," black: %g (%g)\n",
QuantumRange*channel_distortion[BlackChannel],
channel_distortion[BlackChannel]);
if (image->matte != MagickFalse)
- (void) fprintf(stderr," alpha: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," alpha: %g (%g)\n",
QuantumRange*channel_distortion[OpacityChannel],
channel_distortion[OpacityChannel]);
break;
}
case GRAYColorspace:
{
- (void) fprintf(stderr," gray: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," gray: %g (%g)\n",
QuantumRange*channel_distortion[GrayChannel],
channel_distortion[GrayChannel]);
if (image->matte != MagickFalse)
- (void) fprintf(stderr," alpha: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," alpha: %g (%g)\n",
QuantumRange*channel_distortion[OpacityChannel],
channel_distortion[OpacityChannel]);
break;
}
}
- (void) fprintf(stderr," all: %g (%g)\n",
+ (void) FormatLocaleFile(stderr," all: %g (%g)\n",
QuantumRange*channel_distortion[CompositeChannels],
channel_distortion[CompositeChannels]);
break;
@@ -1130,49 +1130,49 @@
case RGBColorspace:
default:
{
- (void) fprintf(stderr," red: %g\n",
+ (void) FormatLocaleFile(stderr," red: %g\n",
channel_distortion[RedChannel]);
- (void) fprintf(stderr," green: %g\n",
+ (void) FormatLocaleFile(stderr," green: %g\n",
channel_distortion[GreenChannel]);
- (void) fprintf(stderr," blue: %g\n",
+ (void) FormatLocaleFile(stderr," blue: %g\n",
channel_distortion[BlueChannel]);
if (image->matte != MagickFalse)
- (void) fprintf(stderr," alpha: %g\n",
+ (void) FormatLocaleFile(stderr," alpha: %g\n",
channel_distortion[OpacityChannel]);
break;
}
case CMYKColorspace:
{
- (void) fprintf(stderr," cyan: %g\n",
+ (void) FormatLocaleFile(stderr," cyan: %g\n",
channel_distortion[CyanChannel]);
- (void) fprintf(stderr," magenta: %g\n",
+ (void) FormatLocaleFile(stderr," magenta: %g\n",
channel_distortion[MagentaChannel]);
- (void) fprintf(stderr," yellow: %g\n",
+ (void) FormatLocaleFile(stderr," yellow: %g\n",
channel_distortion[YellowChannel]);
- (void) fprintf(stderr," black: %g\n",
+ (void) FormatLocaleFile(stderr," black: %g\n",
channel_distortion[BlackChannel]);
if (image->matte != MagickFalse)
- (void) fprintf(stderr," alpha: %g\n",
+ (void) FormatLocaleFile(stderr," alpha: %g\n",
channel_distortion[OpacityChannel]);
break;
}
case GRAYColorspace:
{
- (void) fprintf(stderr," gray: %g\n",
+ (void) FormatLocaleFile(stderr," gray: %g\n",
channel_distortion[GrayChannel]);
if (image->matte != MagickFalse)
- (void) fprintf(stderr," alpha: %g\n",
+ (void) FormatLocaleFile(stderr," alpha: %g\n",
channel_distortion[OpacityChannel]);
break;
}
}
- (void) fprintf(stderr," all: %g\n",
+ (void) FormatLocaleFile(stderr," all: %g\n",
channel_distortion[CompositeChannels]);
break;
}
case MeanErrorPerPixelMetric:
{
- (void) fprintf(stderr," %g (%g, %g)\n",
+ (void) FormatLocaleFile(stderr," %g (%g, %g)\n",
channel_distortion[CompositeChannels],
image->error.normalized_mean_error,
image->error.normalized_maximum_error);
diff --git a/wand/composite.c b/wand/composite.c
index 8761f17..94eadf0 100644
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -454,10 +454,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -1131,7 +1131,7 @@
i++;
if (i == (ssize_t) argc)
ThrowCompositeException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowCompositeInvalidArgumentException(option,argv[i]);
@@ -1537,10 +1537,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/wand/conjure.c b/wand/conjure.c
index bb9db5c..8981569 100644
--- a/wand/conjure.c
+++ b/wand/conjure.c
@@ -268,10 +268,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
/*
@@ -291,7 +291,7 @@
status=SetImageOption(image_info,"filename",argv[i]);
if (status == MagickFalse)
ThrowConjureException(ImageError,"UnableToPersistKey",argv[i]);
- (void) FormatMagickString(image_info->filename,MaxTextExtent,"msl:%s",
+ (void) FormatLocaleString(image_info->filename,MaxTextExtent,"msl:%s",
argv[i]);
image=ReadImages(image_info,exception);
CatchException(exception);
diff --git a/wand/convert.c b/wand/convert.c
index e2f6c15..0ab925b 100644
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -524,10 +524,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -1847,7 +1847,7 @@
i++;
if (i == (ssize_t) argc)
ThrowConvertException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowConvertInvalidArgumentException(option,argv[i]);
@@ -2897,10 +2897,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("view",option+1) == 0)
diff --git a/wand/deprecate.c b/wand/deprecate.c
index 25f1189..1fad247 100644
--- a/wand/deprecate.c
+++ b/wand/deprecate.c
@@ -135,7 +135,7 @@
images->filename);
(void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand));
clone_wand->id=AcquireWandId();
- (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g",
MagickWandId,(double) clone_wand->id);
clone_wand->exception=AcquireExceptionInfo();
InheritException(clone_wand->exception,wand->exception);
@@ -207,7 +207,7 @@
pixel_view->name);
(void) ResetMagickMemory(clone_view,0,sizeof(*clone_view));
clone_view->id=AcquireWandId();
- (void) FormatMagickString(clone_view->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_view->name,MaxTextExtent,"%s-%.20g",
PixelViewId,(double) clone_view->id);
clone_view->exception=AcquireExceptionInfo();
InheritException(clone_view->exception,pixel_view->exception);
@@ -2266,7 +2266,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(option,MaxTextExtent,"%s:%s=%s",format,key,value);
+ (void) FormatLocaleString(option,MaxTextExtent,"%s:%s=%s",format,key,value);
return(DefineImageOption(wand->image_info,option));
}
@@ -2505,7 +2505,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(pixel_view,0,sizeof(*pixel_view));
pixel_view->id=AcquireWandId();
- (void) FormatMagickString(pixel_view->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(pixel_view->name,MaxTextExtent,"%s-%.20g",
PixelViewId,(double) pixel_view->id);
pixel_view->exception=AcquireExceptionInfo();
pixel_view->wand=wand;
@@ -2564,7 +2564,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(pixel_view,0,sizeof(*pixel_view));
pixel_view->id=AcquireWandId();
- (void) FormatMagickString(pixel_view->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(pixel_view->name,MaxTextExtent,"%s-%.20g",
PixelViewId,(double) pixel_view->id);
pixel_view->exception=AcquireExceptionInfo();
pixel_view->view=AcquireCacheView(pixel_view->wand->images);
diff --git a/wand/display.c b/wand/display.c
index a63b3c6..3a80c19 100644
--- a/wand/display.c
+++ b/wand/display.c
@@ -359,10 +359,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -1310,7 +1310,7 @@
i++;
if (i == (ssize_t) argc)
ThrowDisplayException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowDisplayInvalidArgumentException(option,argv[i]);
@@ -1787,10 +1787,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("visual",option+1) == 0)
@@ -1844,7 +1844,7 @@
i++;
if (i == (ssize_t) argc)
ThrowDisplayException(OptionError,"MissingArgument",option);
- if (StringToDouble(argv[i],(char **) NULL) != 0)
+ if (LocaleToDouble(argv[i],(char **) NULL) != 0)
resource_info.window_group=argv[i];
break;
}
@@ -1863,7 +1863,7 @@
answer[2],
*p;
- (void) fprintf(stderr,"Overwrite %s? ",
+ (void) FormatLocaleFile(stderr,"Overwrite %s? ",
resource_info.write_filename);
p=fgets(answer,(int) sizeof(answer),stdin);
(void) p;
diff --git a/wand/drawing-wand.c b/wand/drawing-wand.c
index 108a98c..5fc15a0 100644
--- a/wand/drawing-wand.c
+++ b/wand/drawing-wand.c
@@ -565,7 +565,7 @@
"MemoryAllocationFailed",GetExceptionMessage(errno));
(void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand));
clone_wand->id=AcquireWandId();
- (void) FormatMagickString(clone_wand->name,MaxTextExtent,"DrawingWand-%.20g",
+ (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"DrawingWand-%.20g",
(double) clone_wand->id);
clone_wand->exception=AcquireExceptionInfo();
InheritException(clone_wand->exception,wand->exception);
@@ -1039,7 +1039,7 @@
char
buffer[MaxTextExtent];
- (void) FormatMagickString(buffer,MaxTextExtent,"%.20g bytes",(double)
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g bytes",(double)
(4L*blob_length/3L+4L));
ThrowDrawException(ResourceLimitWarning,"MemoryAllocationFailed",
wand->name);
@@ -2489,7 +2489,7 @@
child=AddChildToXMLTree(xml_info,"fill-opacity",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",
(double) QuantumScale*(QuantumRange-CurrentContext->fill.opacity));
(void) SetXMLTreeContent(child,value);
}
@@ -2510,7 +2510,7 @@
child=AddChildToXMLTree(xml_info,"font-size",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",
CurrentContext->pointsize);
(void) SetXMLTreeContent(child,value);
}
@@ -2531,7 +2531,7 @@
child=AddChildToXMLTree(xml_info,"font-weight",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
CurrentContext->weight);
(void) SetXMLTreeContent(child,value);
}
@@ -2556,7 +2556,7 @@
child=AddChildToXMLTree(xml_info,"stroke-antialias",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%d",
+ (void) FormatLocaleString(value,MaxTextExtent,"%d",
CurrentContext->stroke_antialias != MagickFalse ? 1 : 0);
(void) SetXMLTreeContent(child,value);
}
@@ -2572,7 +2572,7 @@
{
if (i != 0)
(void) ConcatenateString(&dash_pattern,",");
- (void) FormatMagickString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",
CurrentContext->dash_pattern[i]);
(void) ConcatenateString(&dash_pattern,value);
}
@@ -2582,7 +2582,7 @@
child=AddChildToXMLTree(xml_info,"stroke-dashoffset",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",
CurrentContext->dash_offset);
(void) SetXMLTreeContent(child,value);
}
@@ -2604,21 +2604,21 @@
child=AddChildToXMLTree(xml_info,"stroke-miterlimit",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
CurrentContext->miterlimit);
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"stroke-opacity",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",
(double) QuantumScale*(QuantumRange-CurrentContext->stroke.opacity));
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"stroke-width",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MaxTextExtent,"%g",
CurrentContext->stroke_width);
(void) SetXMLTreeContent(child,value);
}
@@ -2632,7 +2632,7 @@
child=AddChildToXMLTree(xml_info,"text-antialias",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) FormatMagickString(value,MaxTextExtent,"%d",
+ (void) FormatLocaleString(value,MaxTextExtent,"%d",
CurrentContext->text_antialias != MagickFalse ? 1 : 0);
(void) SetXMLTreeContent(child,value);
}
@@ -4085,9 +4085,9 @@
wand->name);
return(MagickFalse);
}
- (void) FormatMagickString(key,MaxTextExtent,"%s",wand->pattern_id);
+ (void) FormatLocaleString(key,MaxTextExtent,"%s",wand->pattern_id);
(void) SetImageArtifact(wand->image,key,wand->mvg+wand->pattern_offset);
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
(double) wand->pattern_bounds.width,(double) wand->pattern_bounds.height,
(double) wand->pattern_bounds.x,(double) wand->pattern_bounds.y);
(void) SetImageArtifact(wand->image,key,geometry);
@@ -4814,7 +4814,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",x_resolution,
+ (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",x_resolution,
y_resolution);
(void) CloneString(&CurrentContext->density,density);
return(MagickTrue);
@@ -4910,13 +4910,13 @@
ThrowDrawException(DrawError,"NotARelativeURL",fill_url);
return(MagickFalse);
}
- (void) FormatMagickString(pattern,MaxTextExtent,"%s",fill_url+1);
+ (void) FormatLocaleString(pattern,MaxTextExtent,"%s",fill_url+1);
if (GetImageArtifact(wand->image,pattern) == (const char *) NULL)
{
ThrowDrawException(DrawError,"URLNotFound",fill_url)
return(MagickFalse);
}
- (void) FormatMagickString(pattern_spec,MaxTextExtent,"url(%s)",fill_url);
+ (void) FormatLocaleString(pattern_spec,MaxTextExtent,"url(%s)",fill_url);
#if DRAW_BINARY_IMPLEMENTATION
DrawPatternPath(wand->image,CurrentContext,pattern_spec,
&CurrentContext->fill_pattern);
@@ -5350,13 +5350,13 @@
assert(stroke_url != NULL);
if (stroke_url[0] != '#')
ThrowDrawException(DrawError,"NotARelativeURL",stroke_url);
- (void) FormatMagickString(pattern,MaxTextExtent,"%s",stroke_url+1);
+ (void) FormatLocaleString(pattern,MaxTextExtent,"%s",stroke_url+1);
if (GetImageArtifact(wand->image,pattern) == (const char *) NULL)
{
ThrowDrawException(DrawError,"URLNotFound",stroke_url)
return(MagickFalse);
}
- (void) FormatMagickString(pattern_spec,MaxTextExtent,"url(%s)",stroke_url);
+ (void) FormatLocaleString(pattern_spec,MaxTextExtent,"url(%s)",stroke_url);
#if DRAW_BINARY_IMPLEMENTATION
DrawPatternPath(wand->image,CurrentContext,pattern_spec,
&CurrentContext->stroke_pattern);
@@ -6222,7 +6222,7 @@
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
CurrentContext->fill.opacity=ClampToQuantum((MagickRealType)
- QuantumRange*(1.0-StringToDouble(value,(char **) NULL)));
+ QuantumRange*(1.0-LocaleToDouble(value,(char **) NULL)));
}
child=GetXMLTreeChild(xml_info,"fill-rule");
if (child != (XMLTreeInfo *) NULL)
@@ -6243,7 +6243,7 @@
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- CurrentContext->pointsize=StringToDouble(value,(char **) NULL);
+ CurrentContext->pointsize=LocaleToDouble(value,(char **) NULL);
}
child=GetXMLTreeChild(xml_info,"font-stretch");
if (child != (XMLTreeInfo *) NULL)
@@ -6339,7 +6339,7 @@
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- CurrentContext->dash_pattern[j]=StringToDouble(token,(char **) NULL);
+ CurrentContext->dash_pattern[j]=LocaleToDouble(token,(char **) NULL);
}
if ((x & 0x01) != 0)
for ( ; j < (2*x); j++)
@@ -6354,7 +6354,7 @@
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- CurrentContext->dash_offset=StringToDouble(value,(char **) NULL);
+ CurrentContext->dash_offset=LocaleToDouble(value,(char **) NULL);
}
child=GetXMLTreeChild(xml_info,"stroke-linecap");
if (child != (XMLTreeInfo *) NULL)
@@ -6385,14 +6385,14 @@
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
CurrentContext->stroke.opacity=ClampToQuantum((MagickRealType)
- QuantumRange*(1.0-StringToDouble(value,(char **) NULL)));
+ QuantumRange*(1.0-LocaleToDouble(value,(char **) NULL)));
}
child=GetXMLTreeChild(xml_info,"stroke-width");
if (child != (XMLTreeInfo *) NULL)
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- CurrentContext->stroke_width=StringToDouble(value,(char **) NULL);
+ CurrentContext->stroke_width=LocaleToDouble(value,(char **) NULL);
}
child=GetXMLTreeChild(xml_info,"text-align");
if (child != (XMLTreeInfo *) NULL)
@@ -6653,7 +6653,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(wand,0,sizeof(*wand));
wand->id=AcquireWandId();
- (void) FormatMagickString(wand->name,MaxTextExtent,"%s-%.20g",DrawingWandId,
+ (void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",DrawingWandId,
(double) wand->id);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
diff --git a/wand/drawtest.c b/wand/drawtest.c
index be9282a..2cc5f09 100644
--- a/wand/drawtest.c
+++ b/wand/drawtest.c
@@ -57,7 +57,7 @@
severity; \
\
description=MagickGetException(wand,&severity); \
- (void) fprintf(stderr,"%s %s %lu %s\n",GetMagickModule(),description); \
+ (void) FormatLocaleFile(stderr,"%s %s %lu %s\n",GetMagickModule(),description); \
description=(char *) MagickRelinquishMemory(description); \
exit(-1); \
}
diff --git a/wand/identify.c b/wand/identify.c
index a71e4c6..687d560 100644
--- a/wand/identify.c
+++ b/wand/identify.c
@@ -243,10 +243,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -637,7 +637,7 @@
i++;
if (i == (ssize_t) argc)
ThrowIdentifyException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowIdentifyInvalidArgumentException(option,argv[i]);
diff --git a/wand/import.c b/wand/import.c
index decefa9..19b953e 100644
--- a/wand/import.c
+++ b/wand/import.c
@@ -309,10 +309,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -942,7 +942,7 @@
i++;
if (i == (ssize_t) argc)
ThrowImportException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowImportInvalidArgumentException(option,argv[i]);
@@ -1272,10 +1272,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
ThrowImportException(OptionError,"UnrecognizedOption",option);
diff --git a/wand/magick-image.c b/wand/magick-image.c
index 352d31f..2f95ccd 100644
--- a/wand/magick-image.c
+++ b/wand/magick-image.c
@@ -105,7 +105,7 @@
images->filename);
(void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand));
clone_wand->id=AcquireWandId();
- (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g",
MagickWandId,(double) clone_wand->id);
clone_wand->exception=AcquireExceptionInfo();
InheritException(clone_wand->exception,wand->exception);
@@ -645,7 +645,7 @@
if (draw_info == (DrawInfo *) NULL)
return(MagickFalse);
(void) CloneString(&draw_info->text,text);
- (void) FormatMagickString(geometry,MaxTextExtent,"%+g%+g",x,y);
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",x,y);
draw_info->affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
draw_info->affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
draw_info->affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
@@ -894,7 +894,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- (void) FormatMagickString(thresholds,MaxTextExtent,
+ (void) FormatLocaleString(thresholds,MaxTextExtent,
QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat,
PixelGetRedQuantum(threshold),PixelGetGreenQuantum(threshold),
PixelGetBlueQuantum(threshold),PixelGetOpacityQuantum(threshold));
@@ -1599,7 +1599,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- (void) FormatMagickString(percent_opaque,MaxTextExtent,
+ (void) FormatLocaleString(percent_opaque,MaxTextExtent,
"%g,%g,%g,%g",(double) (100.0*QuantumScale*
PixelGetRedQuantum(opacity)),(double) (100.0*QuantumScale*
PixelGetGreenQuantum(opacity)),(double) (100.0*QuantumScale*
@@ -6960,7 +6960,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- (void) FormatMagickString(modulate,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g",
brightness,saturation,hue);
status=ModulateImage(wand->images,modulate);
if (status == MagickFalse)
@@ -8411,7 +8411,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- (void) FormatMagickString(threshold,MaxTextExtent,"%gx%g",low,high);
+ (void) FormatLocaleString(threshold,MaxTextExtent,"%gx%g",low,high);
status=RandomThresholdImageChannel(wand->images,channel,threshold,
wand->exception);
if (status == MagickFalse)
@@ -12135,7 +12135,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- (void) FormatMagickString(percent_opaque,MaxTextExtent,
+ (void) FormatLocaleString(percent_opaque,MaxTextExtent,
"%g,%g,%g,%g",(double) (100.0*QuantumScale*
PixelGetRedQuantum(opacity)),(double) (100.0*QuantumScale*
PixelGetGreenQuantum(opacity)),(double) (100.0*QuantumScale*
@@ -12700,7 +12700,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- (void) FormatMagickString(thresholds,MaxTextExtent,
+ (void) FormatLocaleString(thresholds,MaxTextExtent,
QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat,
PixelGetRedQuantum(threshold),PixelGetGreenQuantum(threshold),
PixelGetBlueQuantum(threshold),PixelGetOpacityQuantum(threshold));
diff --git a/wand/magick-property.c b/wand/magick-property.c
index e090309..c22c033 100644
--- a/wand/magick-property.c
+++ b/wand/magick-property.c
@@ -1538,7 +1538,7 @@
while (((int) *p != 0) && ((isspace((int) ((unsigned char) *p)) != 0) ||
(*p == ',')))
p++;
- sampling_factors[i]=StringToDouble(p,(char **) NULL);
+ sampling_factors[i]=LocaleToDouble(p,(char **) NULL);
i++;
}
*number_factors=(size_t) i;
@@ -2556,7 +2556,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
(double) width,(double) height,(double) x,(double) y);
(void) CloneString(&wand->image_info->page,geometry);
return(MagickTrue);
@@ -2756,7 +2756,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(density,MaxTextExtent,"%gx%g",x_resolution,
+ (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",x_resolution,
y_resolution);
(void) CloneString(&wand->image_info->density,density);
return(MagickTrue);
@@ -2810,12 +2810,12 @@
return(MagickTrue);
for (i=0; i < (ssize_t) (number_factors-1); i++)
{
- (void) FormatMagickString(sampling_factor,MaxTextExtent,"%g,",
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%g,",
sampling_factors[i]);
(void) ConcatenateString(&wand->image_info->sampling_factor,
sampling_factor);
}
- (void) FormatMagickString(sampling_factor,MaxTextExtent,"%g",
+ (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%g",
sampling_factors[i]);
(void) ConcatenateString(&wand->image_info->sampling_factor,sampling_factor);
return(MagickTrue);
@@ -2859,7 +2859,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
columns,(double) rows);
(void) CloneString(&wand->image_info->size,geometry);
return(MagickTrue);
@@ -2906,7 +2906,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g",
(double) columns,(double) rows,(double) offset);
(void) CloneString(&wand->image_info->size,geometry);
return(MagickTrue);
diff --git a/wand/magick-wand.c b/wand/magick-wand.c
index 8e923a3..6b8b615 100644
--- a/wand/magick-wand.c
+++ b/wand/magick-wand.c
@@ -135,7 +135,7 @@
wand->name);
(void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand));
clone_wand->id=AcquireWandId();
- (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g",
MagickWandId,(double) clone_wand->id);
clone_wand->exception=AcquireExceptionInfo();
InheritException(clone_wand->exception,wand->exception);
@@ -1037,7 +1037,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(wand,0,sizeof(*wand));
wand->id=AcquireWandId();
- (void) FormatMagickString(wand->name,MaxTextExtent,"%s-%.20g",MagickWandId,
+ (void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",MagickWandId,
(double) wand->id);
wand->exception=AcquireExceptionInfo();
wand->image_info=AcquireImageInfo();
diff --git a/wand/mogrify.c b/wand/mogrify.c
index 1df9691..17ab1ac 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -149,7 +149,7 @@
if (LocaleCompare("debug",option+1) == 0)
(void) SetLogEventMask(argv[++i]);
if (LocaleCompare("duration",option+1) == 0)
- duration=StringToDouble(argv[++i],(char **) NULL);
+ duration=LocaleToDouble(argv[++i],(char **) NULL);
if (LocaleCompare("regard-warnings",option+1) == 0)
regard_warnings=MagickTrue;
}
@@ -223,7 +223,7 @@
{
elapsed_time=GetElapsedTime(timer);
user_time=GetUserTime(timer);
- (void) fprintf(stderr,
+ (void) FormatLocaleFile(stderr,
"Performance: %.20gi %gips %0.3fu %.20g:%02g.%03g\n",(double)
iterations,1.0*iterations/elapsed_time,user_time,(double)
(elapsed_time/60.0),floor(fmod(elapsed_time,60.0)),(double)
@@ -312,7 +312,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);
@@ -363,19 +363,19 @@
p=strrchr(tag,'/');
if (p != (char *) NULL)
*p='\0';
- (void) FormatMagickString(message,MaxTextExtent,"Monitor/%s",tag);
+ (void) FormatLocaleString(message,MaxTextExtent,"Monitor/%s",tag);
locale_message=GetLocaleMessage(message);
if (locale_message == message)
locale_message=tag;
if (p == (char *) NULL)
- (void) fprintf(stderr,"%s: %ld of %lu, %02ld%% complete\r",locale_message,
+ (void) FormatLocaleFile(stderr,"%s: %ld of %lu, %02ld%% complete\r",locale_message,
(long) offset,(unsigned long) extent,(long) (100L*offset/(extent-1)));
else
- (void) fprintf(stderr,"%s[%s]: %ld of %lu, %02ld%% complete\r",
+ (void) FormatLocaleFile(stderr,"%s[%s]: %ld of %lu, %02ld%% complete\r",
locale_message,p+1,(long) offset,(unsigned long) extent,(long)
(100L*offset/(extent-1)));
if (offset == (MagickOffsetType) (extent-1))
- (void) fprintf(stderr,"\n");
+ (void) FormatLocaleFile(stderr,"\n");
(void) fflush(stderr);
return(MagickTrue);
}
@@ -511,7 +511,7 @@
error = MagickTrue;
break;
}
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
/* Y coordinate */
token[0]=','; while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' ) break;
@@ -522,7 +522,7 @@
error = MagickTrue;
break;
}
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
/* color values for this control point */
#if 0
if ( (color_from_image ) {
@@ -556,35 +556,35 @@
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
break;
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
if ( channels & GreenChannel ) {
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
break;
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
if ( channels & BlueChannel ) {
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
break;
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
if ( channels & IndexChannel ) {
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
break;
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
if ( channels & OpacityChannel ) {
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
break;
- sparse_arguments[x++]=StringToDouble(token,(char **) NULL);
+ sparse_arguments[x++]=LocaleToDouble(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
}
@@ -775,7 +775,7 @@
break;
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatMagickString(geometry,MaxTextExtent,"%+f%+f",
+ (void) FormatLocaleString(geometry,MaxTextExtent,"%+f%+f",
geometry_info.xi,geometry_info.psi);
(void) CloneString(&draw_info->geometry,geometry);
draw_info->affine.sx=cos(DegreesToRadians(
@@ -1392,7 +1392,7 @@
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- arguments[x]=StringToDouble(token,(char **) NULL);
+ arguments[x]=LocaleToDouble(token,(char **) NULL);
}
args=DestroyString(args);
mogrify_image=DistortImage(*image,method,number_arguments,arguments,
@@ -1697,7 +1697,7 @@
GetMagickToken(p,&p,token);
if (*token == ',')
GetMagickToken(p,&p,token);
- parameters[x]=StringToDouble(token,(char **) NULL);
+ parameters[x]=LocaleToDouble(token,(char **) NULL);
}
arguments=DestroyString(arguments);
(void) FunctionImageChannel(*image,channel,function,
@@ -1716,14 +1716,14 @@
*/
(void) SyncImageSettings(mogrify_info,*image);
if (*option == '+')
- (*image)->gamma=StringToDouble(argv[i+1],(char **) NULL);
+ (*image)->gamma=LocaleToDouble(argv[i+1],(char **) NULL);
else
{
if (strchr(argv[i+1],',') != (char *) NULL)
(void) GammaImage(*image,argv[i+1]);
else
(void) GammaImageChannel(*image,channel,
- StringToDouble(argv[i+1],(char **) NULL));
+ LocaleToDouble(argv[i+1],(char **) NULL));
InheritException(exception,&(*image)->exception);
}
break;
@@ -1968,7 +1968,7 @@
}
if (LocaleCompare("linewidth",option+1) == 0)
{
- draw_info->stroke_width=StringToDouble(argv[i+1],(char **) NULL);
+ draw_info->stroke_width=LocaleToDouble(argv[i+1],(char **) NULL);
break;
}
if (LocaleCompare("liquid-rescale",option+1) == 0)
@@ -2389,7 +2389,7 @@
*/
(void) SyncImageSettings(mogrify_info,*image);
mogrify_image=RadialBlurImageChannel(*image,channel,
- StringToDouble(argv[i+1],(char **) NULL),exception);
+ LocaleToDouble(argv[i+1],(char **) NULL),exception);
break;
}
if (LocaleCompare("raise",option+1) == 0)
@@ -2880,7 +2880,7 @@
}
if (LocaleCompare("strokewidth",option+1) == 0)
{
- draw_info->stroke_width=StringToDouble(argv[i+1],(char **) NULL);
+ draw_info->stroke_width=LocaleToDouble(argv[i+1],(char **) NULL);
break;
}
if (LocaleCompare("style",option+1) == 0)
@@ -3630,10 +3630,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -3705,7 +3705,7 @@
if (path != (char *) NULL)
{
GetPathComponent(option,TailPath,filename);
- (void) FormatMagickString(images->filename,MaxTextExtent,"%s%c%s",
+ (void) FormatLocaleString(images->filename,MaxTextExtent,"%s%c%s",
path,*DirectorySeparator,filename);
}
if (format != (char *) NULL)
@@ -4922,7 +4922,7 @@
i++;
if (i == (ssize_t) argc)
ThrowMogrifyException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowMogrifyInvalidArgumentException(option,argv[i]);
@@ -5950,10 +5950,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("view",option+1) == 0)
@@ -6857,10 +6857,10 @@
canonical_page=GetPageGeometry(argv[i+1]);
flags=ParseAbsoluteGeometry(canonical_page,&geometry);
canonical_page=DestroyString(canonical_page);
- (void) FormatMagickString(page,MaxTextExtent,"%lux%lu",
+ (void) FormatLocaleString(page,MaxTextExtent,"%lux%lu",
(unsigned long) geometry.width,(unsigned long) geometry.height);
if (((flags & XValue) != 0) || ((flags & YValue) != 0))
- (void) FormatMagickString(page,MaxTextExtent,"%lux%lu%+ld%+ld",
+ (void) FormatLocaleString(page,MaxTextExtent,"%lux%lu%+ld%+ld",
(unsigned long) geometry.width,(unsigned long) geometry.height,
(long) geometry.x,(long) geometry.y);
(void) SetImageOption(image_info,option+1,page);
@@ -8003,7 +8003,7 @@
if (string == (char *) NULL)
break;
InheritException(exception,&(*images)->exception);
- (void) fprintf(stdout,"%s",string);
+ (void) FormatLocaleFile(stdout,"%s",string);
string=DestroyString(string);
}
if (LocaleCompare("process",option+1) == 0)
@@ -8169,7 +8169,7 @@
*write_info;
(void) SyncImagesSettings(mogrify_info,*images);
- (void) FormatMagickString(key,MaxTextExtent,"cache:%s",argv[i+1]);
+ (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",argv[i+1]);
(void) DeleteImageRegistry(key);
write_images=(*images);
if (*option == '+')
@@ -8265,7 +8265,7 @@
status=0;
#if 0
-fprintf(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,post?"post":"pre");
+FormatLocaleFile(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,post?"post":"pre");
#endif
/*
@@ -8282,7 +8282,7 @@
for (;;)
{
#if 0
-fprintf(stderr, "mogrify %ld of %ld\n",
+FormatLocaleFile(stderr, "mogrify %ld of %ld\n",
(long)GetImageIndexInList(*images),(long)GetImageListLength(*images));
#endif
status&=MogrifyImage(image_info,argc,argv,images,exception);
@@ -8296,7 +8296,7 @@
}
assert( *images != (Image *) NULL );
#if 0
-fprintf(stderr, "mogrify end %ld of %ld\n",
+FormatLocaleFile(stderr, "mogrify end %ld of %ld\n",
(long)GetImageIndexInList(*images),(long)GetImageListLength(*images));
#endif
diff --git a/wand/montage.c b/wand/montage.c
index 6235350..795270b 100644
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -334,10 +334,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -414,7 +414,7 @@
(void) InterpretImageFilename(image_info,(Image *) NULL,
image_info->filename,(int) scene,filename);
if (LocaleCompare(filename,image_info->filename) == 0)
- (void) FormatMagickString(filename,MaxTextExtent,"%s.%.20g",
+ (void) FormatLocaleString(filename,MaxTextExtent,"%s.%.20g",
image_info->filename,(double) scene);
(void) CopyMagickString(image_info->filename,filename,
MaxTextExtent);
@@ -1134,7 +1134,7 @@
i++;
if (i == (ssize_t) argc)
ThrowMontageException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowMontageInvalidArgumentException(option,argv[i]);
@@ -1279,7 +1279,7 @@
ThrowMontageException(OptionError,"MissingArgument",option);
if (IsGeometry(argv[i]) == MagickFalse)
ThrowMontageInvalidArgumentException(option,argv[i]);
- montage_info->pointsize=StringToDouble(argv[i],(char **) NULL);
+ montage_info->pointsize=LocaleToDouble(argv[i],(char **) NULL);
break;
}
if (LocaleCompare("polaroid",option+1) == 0)
@@ -1688,10 +1688,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/wand/pixel-iterator.c b/wand/pixel-iterator.c
index 0055cfb..4fcbb66 100644
--- a/wand/pixel-iterator.c
+++ b/wand/pixel-iterator.c
@@ -169,7 +169,7 @@
iterator->name);
(void) ResetMagickMemory(clone_iterator,0,sizeof(*clone_iterator));
clone_iterator->id=AcquireWandId();
- (void) FormatMagickString(clone_iterator->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_iterator->name,MaxTextExtent,"%s-%.20g",
PixelIteratorId,(double) clone_iterator->id);
clone_iterator->exception=AcquireExceptionInfo();
InheritException(clone_iterator->exception,iterator->exception);
@@ -319,7 +319,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(iterator,0,sizeof(*iterator));
iterator->id=AcquireWandId();
- (void) FormatMagickString(iterator->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(iterator->name,MaxTextExtent,"%s-%.20g",
PixelIteratorId,(double) iterator->id);
iterator->exception=AcquireExceptionInfo();
iterator->view=view;
@@ -434,7 +434,7 @@
wand->name);
(void) ResetMagickMemory(iterator,0,sizeof(*iterator));
iterator->id=AcquireWandId();
- (void) FormatMagickString(iterator->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(iterator->name,MaxTextExtent,"%s-%.20g",
PixelIteratorId,(double) iterator->id);
iterator->exception=AcquireExceptionInfo();
iterator->view=view;
diff --git a/wand/pixel-wand.c b/wand/pixel-wand.c
index f7b4d93..45ba46a 100644
--- a/wand/pixel-wand.c
+++ b/wand/pixel-wand.c
@@ -154,7 +154,7 @@
wand->name);
(void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand));
clone_wand->id=AcquireWandId();
- (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g",
PixelWandId,(double) clone_wand->id);
clone_wand->exception=AcquireExceptionInfo();
InheritException(clone_wand->exception,wand->exception);
@@ -406,7 +406,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(wand,0,sizeof(*wand));
wand->id=AcquireWandId();
- (void) FormatMagickString(wand->name,MaxTextExtent,"%s-%.20g",PixelWandId,
+ (void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",PixelWandId,
(double) wand->id);
wand->exception=AcquireExceptionInfo();
GetMagickPixelPacket((Image *) NULL,&wand->pixel);
@@ -747,15 +747,15 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatMagickString(color,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(color,MaxTextExtent,"%g,%g,%g",
(double) (QuantumScale*wand->pixel.red),
(double) (QuantumScale*wand->pixel.green),
(double) (QuantumScale*wand->pixel.blue));
if (wand->pixel.colorspace == CMYKColorspace)
- (void) FormatMagickString(color+strlen(color),MaxTextExtent,",%g",
+ (void) FormatLocaleString(color+strlen(color),MaxTextExtent,",%g",
(double) (QuantumScale*wand->pixel.index));
if (wand->pixel.matte != MagickFalse)
- (void) FormatMagickString(color+strlen(color),MaxTextExtent,",%g",
+ (void) FormatLocaleString(color+strlen(color),MaxTextExtent,",%g",
(double) (QuantumScale*wand->pixel.opacity));
return(ConstantString(color));
}
diff --git a/wand/stream.c b/wand/stream.c
index 4f48ce9..9c3f336 100644
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -231,10 +231,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
return(MagickFalse);
}
}
@@ -545,7 +545,7 @@
i++;
if (i == (ssize_t) argc)
ThrowStreamException(OptionError,"MissingArgument",option);
- value=StringToDouble(argv[i],&p);
+ value=LocaleToDouble(argv[i],&p);
(void) value;
if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
ThrowStreamInvalidArgumentException(option,argv[i]);
@@ -719,10 +719,10 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) fprintf(stdout,"Version: %s\n",
+ (void) FormatLocaleFile(stdout,"Version: %s\n",
GetMagickVersion((size_t *) NULL));
- (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
+ (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(stdout,"Features: %s\n\n",GetMagickFeatures());
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/wand/wand-view.c b/wand/wand-view.c
index 0022414..b18bddf 100644
--- a/wand/wand-view.c
+++ b/wand/wand-view.c
@@ -133,7 +133,7 @@
wand_view->name);
(void) ResetMagickMemory(clone_view,0,sizeof(*clone_view));
clone_view->id=AcquireWandId();
- (void) FormatMagickString(clone_view->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(clone_view->name,MaxTextExtent,"%s-%.20g",
WandViewId,(double) clone_view->id);
clone_view->description=ConstantString(wand_view->description);
clone_view->view=CloneCacheView(wand_view->view);
@@ -772,7 +772,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(wand_view,0,sizeof(*wand_view));
wand_view->id=AcquireWandId();
- (void) FormatMagickString(wand_view->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(wand_view->name,MaxTextExtent,"%s-%.20g",
WandViewId,(double) wand_view->id);
wand_view->description=ConstantString("WandView");
wand_view->wand=wand;
@@ -832,7 +832,7 @@
GetExceptionMessage(errno));
(void) ResetMagickMemory(wand_view,0,sizeof(*wand_view));
wand_view->id=AcquireWandId();
- (void) FormatMagickString(wand_view->name,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(wand_view->name,MaxTextExtent,"%s-%.20g",
WandViewId,(double) wand_view->id);
wand_view->description=ConstantString("WandView");
wand_view->view=AcquireCacheView(wand_view->wand->images);
diff --git a/wand/wandtest.c b/wand/wandtest.c
index 9cc42b6..41d752a 100644
--- a/wand/wandtest.c
+++ b/wand/wandtest.c
@@ -67,7 +67,7 @@
#define ThrowAPIException(wand) \
{ \
description=MagickGetException(wand,&severity); \
- (void) fprintf(stderr,"%s %s %lu %s\n",GetMagickModule(),description); \
+ (void) FormatLocaleFile(stderr,"%s %s %lu %s\n",GetMagickModule(),description); \
description=(char *) MagickRelinquishMemory(description); \
exit(-1); \
}
@@ -424,10 +424,10 @@
(void) MagickGetSize(magick_wand,&columns,&rows);
if ((columns != 640) || (rows != 480))
{
- (void) fprintf(stderr,"Unexpected magick wand size\n");
+ (void) FormatLocaleFile(stderr,"Unexpected magick wand size\n");
exit(1);
}
- (void) fprintf(stdout,"Reading images...\n");
+ (void) FormatLocaleFile(stdout,"Reading images...\n");
{
char
*p,
@@ -447,20 +447,20 @@
if (status == MagickFalse)
ThrowAPIException(magick_wand);
if (MagickGetNumberImages(magick_wand) != 5)
- (void) fprintf(stderr,"read %.20g images; expected 5\n",
+ (void) FormatLocaleFile(stderr,"read %.20g images; expected 5\n",
(double) MagickGetNumberImages(magick_wand));
- (void) fprintf(stdout,"Iterate forward...\n");
+ (void) FormatLocaleFile(stdout,"Iterate forward...\n");
MagickResetIterator(magick_wand);
while (MagickNextImage(magick_wand) != MagickFalse)
- (void) fprintf(stdout,"index %.20g scene %.20g\n",(double)
+ (void) FormatLocaleFile(stdout,"index %.20g scene %.20g\n",(double)
MagickGetIteratorIndex(magick_wand),(double)
MagickGetImageScene(magick_wand));
- (void) fprintf(stdout,"Iterate reverse...\n");
+ (void) FormatLocaleFile(stdout,"Iterate reverse...\n");
while (MagickPreviousImage(magick_wand) != MagickFalse)
- (void) fprintf(stdout,"index %.20g scene %.20g\n",(double)
+ (void) FormatLocaleFile(stdout,"index %.20g scene %.20g\n",(double)
MagickGetIteratorIndex(magick_wand),(double)
MagickGetImageScene(magick_wand));
- (void) fprintf(stdout,"Remove scene 1...\n");
+ (void) FormatLocaleFile(stdout,"Remove scene 1...\n");
(void) MagickSetIteratorIndex(magick_wand,1);
clone_wand=MagickGetImage(magick_wand);
status=MagickRemoveImage(magick_wand);
@@ -468,20 +468,20 @@
ThrowAPIException(magick_wand);
MagickResetIterator(magick_wand);
while (MagickNextImage(magick_wand) != MagickFalse)
- (void) fprintf(stdout,"index %.20g scene %.20g\n",(double)
+ (void) FormatLocaleFile(stdout,"index %.20g scene %.20g\n",(double)
MagickGetIteratorIndex(magick_wand),(double)
MagickGetImageScene(magick_wand));
- (void) fprintf(stdout,"Insert scene 1 back in sequence...\n");
+ (void) FormatLocaleFile(stdout,"Insert scene 1 back in sequence...\n");
(void) MagickSetIteratorIndex(magick_wand,0);
status=MagickAddImage(magick_wand,clone_wand);
if (status == MagickFalse)
ThrowAPIException(magick_wand);
MagickResetIterator(magick_wand);
while (MagickNextImage(magick_wand) != MagickFalse)
- (void) fprintf(stdout,"index %.20g scene %.20g\n",(double)
+ (void) FormatLocaleFile(stdout,"index %.20g scene %.20g\n",(double)
MagickGetIteratorIndex(magick_wand),(double)
MagickGetImageScene(magick_wand));
- (void) fprintf(stdout,"Set scene 2 to scene 1...\n");
+ (void) FormatLocaleFile(stdout,"Set scene 2 to scene 1...\n");
(void) MagickSetIteratorIndex(magick_wand,2);
status=MagickSetImage(magick_wand,clone_wand);
clone_wand=DestroyMagickWand(clone_wand);
@@ -489,10 +489,10 @@
ThrowAPIException(magick_wand);
MagickResetIterator(magick_wand);
while (MagickNextImage(magick_wand) != MagickFalse)
- (void) fprintf(stdout,"index %.20g scene %.20g\n",(double)
+ (void) FormatLocaleFile(stdout,"index %.20g scene %.20g\n",(double)
MagickGetIteratorIndex(magick_wand),(double)
MagickGetImageScene(magick_wand));
- (void) fprintf(stdout,"Apply image processing options...\n");
+ (void) FormatLocaleFile(stdout,"Apply image processing options...\n");
status=MagickCropImage(magick_wand,60,60,10,10);
if (status == MagickFalse)
ThrowAPIException(magick_wand);
@@ -559,7 +559,7 @@
for (i=0; i < 9; i++)
if (pixels[i] != primary_colors[i])
{
- (void) fprintf(stderr,"Get pixels does not match set pixels\n");
+ (void) FormatLocaleFile(stderr,"Get pixels does not match set pixels\n");
exit(1);
}
}
@@ -575,7 +575,7 @@
}
MagickResetIterator(magick_wand);
(void) MagickSetIteratorIndex(magick_wand,4);
- (void) fprintf(stdout,"Utilitize pixel iterator to draw diagonal...\n");
+ (void) FormatLocaleFile(stdout,"Utilitize pixel iterator to draw diagonal...\n");
iterator=NewPixelIterator(magick_wand);
if (iterator == (PixelIterator *) NULL)
ThrowAPIException(magick_wand);
@@ -588,15 +588,15 @@
}
(void) PixelSyncIterator(iterator);
iterator=DestroyPixelIterator(iterator);
- (void) fprintf(stdout,"Write to wandtest_out.miff...\n");
+ (void) FormatLocaleFile(stdout,"Write to wandtest_out.miff...\n");
status=MagickWriteImages(magick_wand,"wandtest_out.miff",MagickTrue);
if (status == MagickFalse)
ThrowAPIException(magick_wand);
- (void) fprintf(stdout,"Change image format from \"MIFF\" to \"GIF\"...\n");
+ (void) FormatLocaleFile(stdout,"Change image format from \"MIFF\" to \"GIF\"...\n");
status=MagickSetImageFormat(magick_wand,"GIF");
if (status == MagickFalse)
ThrowAPIException(magick_wand);
- (void) fprintf(stdout,"Set delay between frames to %d seconds...\n",
+ (void) FormatLocaleFile(stdout,"Set delay between frames to %d seconds...\n",
WandDelay);
status=MagickSetImageDelay(magick_wand,100*WandDelay);
if (status == MagickFalse)
@@ -604,14 +604,14 @@
delay=MagickGetImageDelay(magick_wand);
if (delay != (100*WandDelay))
{
- (void) fprintf( stderr,"Get delay does not match set delay\n");
+ (void) FormatLocaleFile(stderr,"Get delay does not match set delay\n");
exit(1);
}
- (void) fprintf(stdout,"Write to wandtest_out_0.gif...\n");
+ (void) FormatLocaleFile(stdout,"Write to wandtest_out_0.gif...\n");
status=MagickWriteImages(magick_wand,"wandtest_out.gif",MagickTrue);
if (status == MagickFalse)
ThrowAPIException(magick_wand);
- (void) fprintf(stdout,"Set, list, get, and delete wand option...\n");
+ (void) FormatLocaleFile(stdout,"Set, list, get, and delete wand option...\n");
status=MagickSetOption(magick_wand,"wand:custom-option",CustomOption);
if (status == MagickFalse)
ThrowAPIException(magick_wand);
@@ -620,7 +620,7 @@
(strlen(option) != strlen(CustomOption)) ||
(memcmp(option,CustomOption,strlen(option)) != 0))
{
- (void) fprintf( stderr,"Option does not match\n");
+ (void) FormatLocaleFile(stderr,"Option does not match\n");
exit(1);
}
options=MagickGetOptions(magick_wand,"*",&number_options);
@@ -628,7 +628,7 @@
{
for (i=0; i < (ssize_t) number_options; i++)
{
- (void) fprintf(stdout," %s\n",options[i]);
+ (void) FormatLocaleFile(stdout," %s\n",options[i]);
options[i]=(char *) MagickRelinquishMemory(options[i]);
}
options=(char **) MagickRelinquishMemory(options);
@@ -636,7 +636,7 @@
status=MagickDeleteOption(magick_wand,"wand:custom-option");
if (status == MagickFalse)
ThrowAPIException(magick_wand);
- (void) fprintf(stdout,"Set, list, get, and delete wand property...\n");
+ (void) FormatLocaleFile(stdout,"Set, list, get, and delete wand property...\n");
status=MagickSetImageProperty(magick_wand,"wand:custom-property",
CustomProperty);
if (status == MagickFalse)
@@ -646,7 +646,7 @@
(strlen(property) != strlen(CustomProperty)) ||
(memcmp(property,CustomProperty,strlen(property)) != 0))
{
- (void) fprintf( stderr,"Property does not match\n");
+ (void) FormatLocaleFile(stderr,"Property does not match\n");
exit(1);
}
properties=MagickGetImageProperties(magick_wand,"*",&number_properties);
@@ -654,7 +654,7 @@
{
for (i=0; i < (ssize_t) number_properties; i++)
{
- (void) fprintf(stdout," %s\n",properties[i]);
+ (void) FormatLocaleFile(stdout," %s\n",properties[i]);
properties[i]=(char *) MagickRelinquishMemory(properties[i]);
}
properties=(char **) MagickRelinquishMemory(properties);
@@ -662,7 +662,7 @@
status=MagickDeleteImageProperty(magick_wand,"wand:custom-property");
if (status == MagickFalse)
ThrowAPIException(magick_wand);
- (void) fprintf(stdout,"Set, list, get, and remove sRGB color profile...\n");
+ (void) FormatLocaleFile(stdout,"Set, list, get, and remove sRGB color profile...\n");
status=MagickSetImageProfile(magick_wand,"sRGB",sRGBProfile,
sizeof(sRGBProfile));
if (status == MagickFalse)
@@ -671,7 +671,7 @@
if ((profile == (unsigned char *) NULL) || (length != sizeof(sRGBProfile)) ||
(memcmp(profile,sRGBProfile,length) != 0))
{
- (void) fprintf( stderr,"Profile does not match\n");
+ (void) FormatLocaleFile(stderr,"Profile does not match\n");
exit(1);
}
profile=(unsigned char *) MagickRelinquishMemory(profile);
@@ -680,7 +680,7 @@
{
for (i=0; i < (ssize_t) number_profiles; i++)
{
- (void) fprintf(stdout," %s\n",profiles[i]);
+ (void) FormatLocaleFile(stdout," %s\n",profiles[i]);
profiles[i]=(char *) MagickRelinquishMemory(profiles[i]);
}
profiles=(char **) MagickRelinquishMemory(profiles);
@@ -690,11 +690,11 @@
if ((profile == (unsigned char *) NULL) || (length != sizeof(sRGBProfile)) ||
(memcmp(profile,sRGBProfile,length) != 0))
{
- (void) fprintf( stderr,"Profile does not match\n");
+ (void) FormatLocaleFile(stderr,"Profile does not match\n");
exit(1);
}
profile=(unsigned char *) MagickRelinquishMemory(profile);
magick_wand=DestroyMagickWand(magick_wand);
- (void) fprintf(stdout,"Wand tests pass.\n");
+ (void) FormatLocaleFile(stdout,"Wand tests pass.\n");
return(0);
}