- Some operations that worked in-place on some format (e.g,

  "mogrify -rotate 90 foo.tiff") used to leave the result in
  /tmp/magickXXXXXXX with an in-file image comment of
  /tmp/magickXXXXXXX.mgk.
  Now it writes back to foo.tiff and the in-file comment is correct.
  For some reason, working on jpg's didn't exhibit this problem

- Some operations that generate new files from some formats (e.g,
  "mogrify -format jpg -rotate 90 foo.tiff") used to leave the result
  in /tmp/magickXXXXXXX.jpg.
  Now foo.jpg is generated.
  For some reason, converting jpg->tiff didn't exhibit this problem.

2 files changed, 56 insertions, 1 deletions

diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 2ff6aa2345f..bbffe20e384 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/11/24 01:42:00 lukem Exp $
+$NetBSD: distinfo,v 1.6 2001/11/27 01:26:49 lukem Exp $
 
 SHA1 (ImageMagick-5.3.9.tar.bz2) = 554f0168cce4e7597366e70b835cf0b07435a4f9
 Size (ImageMagick-5.3.9.tar.bz2) = 2772757 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = d96ef6ca8dc12861bdb63cf5ab6e7b3358705fde
 SHA1 (patch-ad) = 83e78c89ff45d814c1b509dfc71e37a96aa5d6e7
 SHA1 (patch-ae) = 3b71f2ab7cb02aa547c6f50cbef775d06c011af2
 SHA1 (patch-af) = c7b55329cc0e60fb36a97961b71131e070633992
+SHA1 (patch-ag) = 36a23040a01ecdf457ea2b62ea7fe05491abd3b8
diff --git a/graphics/ImageMagick/patches/patch-ag b/graphics/ImageMagick/patches/patch-ag
new file mode 100644
index 00000000000..6b5c143f62f
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ag
@@ -0,0 +1,54 @@
+$NetBSD: patch-ag,v 1.1 2001/11/27 01:26:49 lukem Exp $
+
+--- utilities/mogrify.c.orig	Sat Sep  8 02:03:51 2001
++++ utilities/mogrify.c
+@@ -1651,11 +1651,12 @@
+               (void) strcpy(p,format);
+             else
+               {
+-                FormatString(image_info->filename,"%.1024s:%.1024s",format,
+-                  image->filename);
+-                (void) strcpy(image->filename,image_info->filename);
++                FormatString(filename, "%.1024s:%.1024s",format,
++                  image_info->filename);
++                (void) strcpy(image->filename,filename);
+               }
+-          }
++          } else 
++            (void) strcpy(image->filename,image_info->filename);
+         /*
+           Transmogrify image as defined by the image processing options.
+         */
+@@ -1669,19 +1670,6 @@
+         */
+         if (format != (char *) NULL)
+           AppendImageFormat(format,image->filename);
+-        else
+-          if (LocaleCompare(image_info->filename,"-") != 0)
+-            {
+-              (void) strcpy(filename,image->filename);
+-              AppendImageFormat("mgk",image->filename);
+-              if (IsAccessible(image->filename))
+-                {
+-                  (void) strcat(image->filename,"~");
+-                  if (IsAccessible(image->filename))
+-                    MagickError(FileOpenError,"Unable to create temporary file",
+-                      filename);
+-                }
+-            }
+         for (p=image; p != (Image *) NULL; p=p->next)
+         {
+           (void) strcpy(p->filename,image->filename);
+@@ -1700,12 +1688,6 @@
+           scene--;
+         if (image_info->verbose)
+           DescribeImage(image,stderr,False);
+-        if ((format == (char *) NULL) && (status != False))
+-          if (LocaleCompare(image_info->filename,"-") != 0)
+-            {
+-              (void) remove(filename);
+-              (void) rename(image->filename,filename);
+-            }
+         DestroyImage(image);
+       }
+   }