From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 2 Feb 2011 01:01:24 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ea5d7c37b9e9acdb3a9234484aa27db99bde2f6;p=imagemagick

---

diff --git a/Magick++/ChangeLog b/Magick++/ChangeLog
index 88de1bac5..8aed5dd05 100644
--- 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 10a149204..e40615882 100644
--- 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;
     }