Changes 6.0.4-3

  * PNG vulnerability fix.
  * Added YCbCr coder for raw Y, Cb, and Cr samples.
  * Fixed the -fx option operator precendence problem (+ and - should be the
    same precendence).
  * Rare memory corruption due to a JPEG comment (bug report by
    brundlefly76@hotma...).
  * The PerlMagick Evaluate() method no longer fails with an assertion error.
  * Restore -dSAFER for a more secure Ghostscript invocation.  The downside is
    we must copy the Postscript file to a temporary file otherwise we get a
    the ocassional invalidfileaccess fom Ghostscript.
  * Do not report image depth unless the -verbose or -format %z option is used
    with the identify program.
  * Center gravity now works when cropping by percent (e.g. -crop 75%).
  * Small memory leak on exception in the ImageToBlob() method.
  * %@ returns the image bounding box (e.g. identify -format %@ logo:).
  * Sync pixel cache when cloning an image-- just in case someone clones
    an image clone and accesses pixels with AcquireImagePixel() instead of
    GetImagePixels().

3 files changed, 12 insertions, 10 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index f37f05c6658..bcc0def2556 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.12 2004/07/08 11:50:25 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/08/09 11:50:08 adam Exp $
 
-IM_MAJOR_VER=		6.0.3
-IM_MINOR_VER=		1
+IM_MAJOR_VER=		6.0.4
+IM_MINOR_VER=		3
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 3fe8dc09f4a..4f64561df8e 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2004/07/08 11:50:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/08/09 11:50:08 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -109,17 +109,17 @@ lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
 lib/libMagick++.so.6
-lib/libMagick++.so.6.3
+lib/libMagick++.so.6.4
 lib/libMagick.a
 lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.6
-lib/libMagick.so.6.3
+lib/libMagick.so.6.4
 lib/libWand.a
 lib/libWand.la
 lib/libWand.so
 lib/libWand.so.6
-lib/libWand.so.6.3
+lib/libWand.so.6.4
 lib/pkgconfig/ImageMagick++.pc
 lib/pkgconfig/ImageMagick.pc
 lib/pkgconfig/Wand.pc
@@ -165,6 +165,7 @@ share/ImageMagick-${IM_MAJOR_LIB_VER}/www/compare.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/download.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/index.html
 share/ImageMagick-${IM_MAJOR_VER}/QuickStart.txt
+share/ImageMagick-${IM_MAJOR_VER}/images/ImageMagick.jpg
 share/ImageMagick-${IM_MAJOR_VER}/images/background.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/devlib.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg
@@ -230,6 +231,7 @@ share/ImageMagick-${IM_MAJOR_VER}/images/rose.png
 share/ImageMagick-${IM_MAJOR_VER}/images/screen.png
 share/ImageMagick-${IM_MAJOR_VER}/images/script.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/sprite.png
+share/ImageMagick-${IM_MAJOR_VER}/images/travelsur.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/twi.png
 share/ImageMagick-${IM_MAJOR_VER}/index.html
 share/ImageMagick-${IM_MAJOR_VER}/www/Changelog.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 23dec58b6d3..496f0582ad7 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2004/07/08 11:50:25 adam Exp $
+$NetBSD: distinfo,v 1.23 2004/08/09 11:50:08 adam Exp $
 
-SHA1 (ImageMagick-6.0.3-1.tar.bz2) = 7a582a759f4f0cfd16b1d3e71df25a1f6a86f79b
-Size (ImageMagick-6.0.3-1.tar.bz2) = 5611725 bytes
+SHA1 (ImageMagick-6.0.4-3.tar.bz2) = 5dba12cc11da6ebe1b0da45b1d1138e858243003
+Size (ImageMagick-6.0.4-3.tar.bz2) = 5741470 bytes