commit b51dff5c0d16a4c1b69ff683e786cb3b4c467694
author cristy <urban-warrior@git.imagemagick.org> Thu May 19 16:55:47 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu May 19 16:55:47 2011 +0000
tree 8d07b4ab4f0caf82eefc6c0f0063e97d096383f1
parent 89505f76b54adb376939f7e85fdf3cf186005d4d

Magick++/lib/Geometry.cpp

diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp
index e406158..23b4a93 100644
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -286,13 +286,13 @@
 
   if ( _width )
     {
-      FormatMagickString( buffer, MaxTextExtent, "%.20g", (double) _width );
+      FormatLocaleString( buffer, MaxTextExtent, "%.20g", (double) _width );
       geometry += buffer;
     }
 
   if ( _height )
     {
-      FormatMagickString( buffer, MaxTextExtent, "%.20g",  (double) _height);
+      FormatLocaleString( buffer, MaxTextExtent, "%.20g",  (double) _height);
       geometry += 'x';
       geometry +=  buffer;
     }
@@ -304,7 +304,7 @@
       else
         geometry += '+';
 
-      FormatMagickString( buffer, MaxTextExtent, "%.20g", (double) _xOff);
+      FormatLocaleString( buffer, MaxTextExtent, "%.20g", (double) _xOff);
       geometry += buffer;
 
       if ( _yNegative )
@@ -312,7 +312,7 @@
       else
         geometry += '+';
 
-      FormatMagickString( buffer, MaxTextExtent, "%.20g", (double) _yOff);
+      FormatLocaleString( buffer, MaxTextExtent, "%.20g", (double) _yOff);
       geometry += buffer;
     }
 

Magick++/lib/Image.cpp

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index d4ccc77..17cec1e 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -410,7 +410,7 @@
   if ( boundingArea_.isValid() ){
     if ( boundingArea_.width() == 0 || boundingArea_.height() == 0 )
       {
-        FormatMagickString( boundingArea, MaxTextExtent, "%+.20g%+.20g",
+        FormatLocaleString( boundingArea, MaxTextExtent, "%+.20g%+.20g",
           (double) boundingArea_.xOff(), (double) boundingArea_.yOff() );
       }
     else
@@ -593,7 +593,7 @@
   }
 
   char opacity[MaxTextExtent];
-  FormatMagickString(opacity,MaxTextExtent,"%u/%u/%u",opacityRed_,opacityGreen_,opacityBlue_);
+  FormatLocaleString(opacity,MaxTextExtent,"%u/%u/%u",opacityRed_,opacityGreen_,opacityBlue_);
 
   ExceptionInfo exceptionInfo;
   GetExceptionInfo( &exceptionInfo );
@@ -1137,7 +1137,7 @@
 void Magick::Image::gamma ( const double gamma_ )
 {
   char gamma[MaxTextExtent + 1];
-  FormatMagickString( gamma, MaxTextExtent, "%3.6f", gamma_);
+  FormatLocaleString( gamma, MaxTextExtent, "%3.6f", gamma_);
 
   modifyImage();
   GammaImage ( image(), gamma );
@@ -1148,7 +1148,7 @@
 			    const double gammaBlue_ )
 {
   char gamma[MaxTextExtent + 1];
-  FormatMagickString( gamma, MaxTextExtent, "%3.6f/%3.6f/%3.6f/",
+  FormatLocaleString( gamma, MaxTextExtent, "%3.6f/%3.6f/%3.6f/",
 		gammaRed_, gammaGreen_, gammaBlue_);
 
   modifyImage();
@@ -1245,7 +1245,7 @@
 {
   modifyImage();
   char levels[MaxTextExtent];
-  FormatMagickString( levels, MaxTextExtent, "%g,%g,%g",black_point,white_point,gamma);
+  FormatLocaleString( levels, MaxTextExtent, "%g,%g,%g",black_point,white_point,gamma);
   (void) LevelImage( image(), levels );
   throwImageException();
 }
@@ -1343,7 +1343,7 @@
 			       const double hue_ )
 {
   char modulate[MaxTextExtent + 1];
-  FormatMagickString( modulate, MaxTextExtent, "%3.6f,%3.6f,%3.6f",
+  FormatLocaleString( modulate, MaxTextExtent, "%3.6f,%3.6f,%3.6f",
 		brightness_, saturation_, hue_);
 
   modifyImage();

Magick++/lib/Magick++/Include.h

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index f7d2e37..939bd61 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -712,7 +712,7 @@
   using MagickCore::FlipImage;
   using MagickCore::FloodfillPaintImage;
   using MagickCore::FlopImage;
-  using MagickCore::FormatMagickString;
+  using MagickCore::FormatLocaleString;
   using MagickCore::ForwardFourierTransformImage;
   using MagickCore::FrameImage;
   using MagickCore::FrameInfo;

Magick++/lib/Options.cpp

diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 1d44072..04fe105 100644
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -357,7 +357,7 @@
 {
   ExceptionInfo exception;
 
-  FormatMagickString( _imageInfo->filename, MaxTextExtent, "%.1024s:", magick_.c_str() );
+  FormatLocaleString( _imageInfo->filename, MaxTextExtent, "%.1024s:", magick_.c_str() );
   GetExceptionInfo(&exception);
   SetImageInfo( _imageInfo, 1, &exception);
   if ( *_imageInfo->magick == '\0' )