(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 77727176562b6a7a31c441ee69d040c9d883cb95..756fb2655216cb2e2a07874f814a0e74950940bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-10-14  6.6.5-1 Cristy  <quetzlzacatenango@image...>
+  * Ignore PS bounding box offsets if -page is set.
+
 2010-10-12  6.6.5-0 Anthony Thyssen <A.Thyssen@griffith...>
   * Added "filter:sigma" expert setting defining the 'sigma' for the Gaussian
     filter only.  This is similar in action to 'blur' but only for Gaussians,

diff --git a/coders/ps.c b/coders/ps.c
index 82eeac815f53c9dd48ed37e9916ea4ffbce480df..e723ec5a3d7b8494483ad3c9e856db89f8ac164a 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -341,8 +341,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
     geometry[MaxTextExtent],
     input_filename[MaxTextExtent],
     options[MaxTextExtent],
-    postscript_filename[MaxTextExtent],
-    translate_geometry[MaxTextExtent];
+    postscript_filename[MaxTextExtent];
 
   const char
     *option;
@@ -689,10 +688,16 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
     "dup wcheck {3 1 roll put} {pop def} ifelse} {def} ifelse\n"
     "<</UseCIEColor true>>setpagedevice\n",MaxTextExtent);
   count=write(file,command,(unsigned int) strlen(command));
-  (void) FormatMagickString(translate_geometry,MaxTextExtent,
-    "%g %g translate\n",-bounds.x1,-bounds.y1);
-  count=write(file,translate_geometry,(unsigned int)
-    strlen(translate_geometry));
+  if (image_info->page == (char *) NULL)
+    {
+      char
+        translate_geometry[MaxTextExtent];
+
+      (void) FormatMagickString(translate_geometry,MaxTextExtent,
+        "%g %g translate\n",-bounds.x1,-bounds.y1);
+      count=write(file,translate_geometry,(unsigned int)
+        strlen(translate_geometry));
+    }
   file=close(file)-1;
   /*
     Render Postscript with the Ghostscript delegate.