(no commit message)

diff --git a/Magick++/ChangeLog b/Magick++/ChangeLog
index 88de1bac5a3922d675690de96b3736ebb3b752b9..8aed5dd05d91db677ffa9cd53b141fd6d1c3ed77 100644 (file)
--- a/Magick++/ChangeLog
+++ b/Magick++/ChangeLog
@@ -1,3 +1,6 @@
+2011-02-01  6.6.7-2 Cristy  <quetzlzacatenango@image...>
+  * Remove extra '+' in the geometry operator.
+
 2010-06-16  6.6.2-2 Cristy  <quetzlzacatenango@image...>
   * Patch for compile problem in mapImages of the STL header.
 

diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp
index 10a149204e482c91011e8145039efc4ba0996b60..e40615882d8f29d9048e03542f8ac184ee3f3236 100644 (file)
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -282,7 +282,7 @@ Magick::Geometry::operator std::string() const
     }
 
   string geometry;
-  char buffer[32];
+  char buffer[MaxTextExtent];
 
   if ( _width )
     {
@@ -304,7 +304,7 @@ Magick::Geometry::operator std::string() const
       else
         geometry += '+';
 
-      FormatMagickString( buffer, MaxTextExtent, "%+.20g", (double) _xOff);
+      FormatMagickString( buffer, MaxTextExtent, "%.20g", (double) _xOff);
       geometry += buffer;
 
       if ( _yNegative )
@@ -312,7 +312,7 @@ Magick::Geometry::operator std::string() const
       else
         geometry += '+';
 
-      FormatMagickString( buffer, MaxTextExtent, "%+.20g", (double) _yOff);
+      FormatMagickString( buffer, MaxTextExtent, "%.20g", (double) _yOff);
       geometry += buffer;
     }