Update GraphicsMagick to 1.3.7.

(CVE-2008-1097 was already fixed by patch-ab in pkgsrc).

1.3.7 (September 17, 2009)
==========================

Security Fixes:

  * PCX: Detect improper rows, columns, or depth.  Fixes CVE-2008-1097
    "Memory corruption in ImageMagick's PCX coder".

  * DrawDashPolygon: Avoid a crash which sometimes occured with tiny
    polygons.

Bug fixes:

  * JPEG: Profile chunks need to be concatentated in order to build
    the whole profile.  This was not working so embedded profiles
    larger than 32K or maybe 64K were being corrupted.  This bug was
    introduced in GraphicsMagick 1.2.

  * Meta: Fix memory leaks.

  * Meta: Work better with with IPTC record 2 blocks and deal better
    with IPTC embedded in an 8BIM profile.  Fixes by John Sergeant.

  * MPC: Fix crash when reading MPC and the input image is modified.

  * PNG: Ensure that the opacity channel is properly initialized.

  * -profile: Lowercase arguments were sometimes not working as
    expected.

  * Topol: Topol reader actually works now and is included in test
    suite.

  * TIFF: Read and write JPEG-compressed grayscale TIFF correctly.

  * VisualMagick configure now works properly when output paths are
    specified.

  * WMF: Eliminate memory leaks.

New Features:

  * MagickWand: New method MagickSetCompressionQuality() to allow
    setting the compression quality.

  * MagickWand: New method CloneDrawingWand() to deep-copy a drawing
    wand.

  * MagickWand: New method DrawGetException() to retrieve information
    regarding the last drawing wand exception (if any).

  * MagickWand: New method DrawClearException() to clear a drawing wand
    exception.

  * Magick++: New Image method cdl() to apply the ASC CDL.

  * Magick++: New Image method colorMatrix() to apply a color matrix
    to the image channels.

  * Magick++: New Image method haldClut)() to apply a color lookup
    table (Hald CLUT) to the image.

  * MSL/Conjure: Added a new 'profile' command which applies, adds, or
    removes one or more IPTC, ICC or generic profiles from a file.
    Work contributed by John Sergeant.

  * Added a 'time' subcommand to provide Unix-style 'time' output when
    a 'time' capability is missing, or the reporting format is
    inconsistent.  For example 'gm time convert ...'.

Feature improvements:

  * ColorMatrixImage(): Add opaque opacity channel when needed.

  * PDF & PS: Use '-type palette' prior to input file name to cause
    Ghostscript to return a dithered colormapped image.

  * PNG: Now compiles with libpng-1.4.0beta74 and later.

  * TIFF: Libtiff in Windows build is upgraded to 3.9.1.  This allows
    GraphicsMagick to read and write 16 and 24 bit float TIFF files.

  * Windows code to find Ghostscript is rewritten from scratch.

Performance Improvements:

  * Drawing of points, lines, and polygons (and complex shapes based
    on these) is now accelerated using OpenMP with excellent speed-up.

  * ICC color transforms now see linear speedup from OpenMP.

  * Rotate: For rotations of 90 or 270 degrees, tile sizes are
    selected more appropriately.

Behavior Changes:

  * No longer clear the exception structure at the start of
    ReadImage() and other similar functions since this sometimes masks
    errors.  The API user is expected to make sure that the exception
    structure is clean prior to invoking a function.

  * SVG: Writer is now disabled since it usually does not work properly.

4 files changed, 21 insertions, 28 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 267dd17308c..23cc652e3ac 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2009/08/26 19:56:40 sno Exp $
+# $NetBSD: Makefile,v 1.25 2009/09/20 11:30:58 obache Exp $
 #
 
-DISTNAME=	GraphicsMagick-1.3.6
-PKGREVISION=	1
+DISTNAME=	GraphicsMagick-1.3.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
diff --git a/graphics/GraphicsMagick/PLIST b/graphics/GraphicsMagick/PLIST
index ebfe548b23f..2716459d16f 100644
--- a/graphics/GraphicsMagick/PLIST
+++ b/graphics/GraphicsMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/08 04:45:28 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/09/20 11:30:58 obache Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -18,10 +18,12 @@ include/GraphicsMagick/Magick++/STL.h
 include/GraphicsMagick/Magick++/TypeMetric.h
 include/GraphicsMagick/magick/api.h
 include/GraphicsMagick/magick/attribute.h
+include/GraphicsMagick/magick/average.h
 include/GraphicsMagick/magick/blob.h
 include/GraphicsMagick/magick/cdl.h
 include/GraphicsMagick/magick/channel.h
 include/GraphicsMagick/magick/color.h
+include/GraphicsMagick/magick/colormap.h
 include/GraphicsMagick/magick/colorspace.h
 include/GraphicsMagick/magick/command.h
 include/GraphicsMagick/magick/compare.h
@@ -32,6 +34,7 @@ include/GraphicsMagick/magick/constitute.h
 include/GraphicsMagick/magick/decorate.h
 include/GraphicsMagick/magick/delegate.h
 include/GraphicsMagick/magick/deprecate.h
+include/GraphicsMagick/magick/describe.h
 include/GraphicsMagick/magick/draw.h
 include/GraphicsMagick/magick/effect.h
 include/GraphicsMagick/magick/enhance.h
@@ -39,6 +42,7 @@ include/GraphicsMagick/magick/error.h
 include/GraphicsMagick/magick/forward.h
 include/GraphicsMagick/magick/fx.h
 include/GraphicsMagick/magick/gem.h
+include/GraphicsMagick/magick/gradient.h
 include/GraphicsMagick/magick/hclut.h
 include/GraphicsMagick/magick/image.h
 include/GraphicsMagick/magick/list.h
@@ -55,6 +59,7 @@ include/GraphicsMagick/magick/operator.h
 include/GraphicsMagick/magick/paint.h
 include/GraphicsMagick/magick/pixel_cache.h
 include/GraphicsMagick/magick/pixel_iterator.h
+include/GraphicsMagick/magick/plasma.h
 include/GraphicsMagick/magick/profile.h
 include/GraphicsMagick/magick/quantize.h
 include/GraphicsMagick/magick/random.h
@@ -64,7 +69,9 @@ include/GraphicsMagick/magick/resize.h
 include/GraphicsMagick/magick/resource.h
 include/GraphicsMagick/magick/shear.h
 include/GraphicsMagick/magick/signature.h
+include/GraphicsMagick/magick/statistics.h
 include/GraphicsMagick/magick/symbols.h
+include/GraphicsMagick/magick/texture.h
 include/GraphicsMagick/magick/timer.h
 include/GraphicsMagick/magick/transform.h
 include/GraphicsMagick/magick/utility.h
@@ -102,6 +109,7 @@ share/doc/GraphicsMagick/ChangeLog.2004
 share/doc/GraphicsMagick/ChangeLog.2005
 share/doc/GraphicsMagick/ChangeLog.2006
 share/doc/GraphicsMagick/ChangeLog.2007
+share/doc/GraphicsMagick/ChangeLog.2008
 share/doc/GraphicsMagick/Copyright.txt
 share/doc/GraphicsMagick/NEWS.txt
 share/doc/GraphicsMagick/www/CVS.html
@@ -170,16 +178,19 @@ share/doc/GraphicsMagick/www/api/api.html
 share/doc/GraphicsMagick/www/api/api.rst
 share/doc/GraphicsMagick/www/api/api_hyperlinks.rst
 share/doc/GraphicsMagick/www/api/attribute.html
+share/doc/GraphicsMagick/www/api/average.html
 share/doc/GraphicsMagick/www/api/blob.html
 share/doc/GraphicsMagick/www/api/cdl.html
 share/doc/GraphicsMagick/www/api/channel.html
 share/doc/GraphicsMagick/www/api/color.html
+share/doc/GraphicsMagick/www/api/colormap.html
 share/doc/GraphicsMagick/www/api/compare.html
 share/doc/GraphicsMagick/www/api/composite.html
 share/doc/GraphicsMagick/www/api/confirm_access.html
 share/doc/GraphicsMagick/www/api/constitute.html
 share/doc/GraphicsMagick/www/api/decorate.html
 share/doc/GraphicsMagick/www/api/deprecate.html
+share/doc/GraphicsMagick/www/api/describe.html
 share/doc/GraphicsMagick/www/api/display.html
 share/doc/GraphicsMagick/www/api/draw.html
 share/doc/GraphicsMagick/www/api/effect.html
@@ -197,6 +208,7 @@ share/doc/GraphicsMagick/www/api/operator.html
 share/doc/GraphicsMagick/www/api/paint.html
 share/doc/GraphicsMagick/www/api/pixel_cache.html
 share/doc/GraphicsMagick/www/api/pixel_iterator.html
+share/doc/GraphicsMagick/www/api/plasma.html
 share/doc/GraphicsMagick/www/api/profile.html
 share/doc/GraphicsMagick/www/api/quantize.html
 share/doc/GraphicsMagick/www/api/registry.html
@@ -206,6 +218,8 @@ share/doc/GraphicsMagick/www/api/resource.html
 share/doc/GraphicsMagick/www/api/segment.html
 share/doc/GraphicsMagick/www/api/shear.html
 share/doc/GraphicsMagick/www/api/signature.html
+share/doc/GraphicsMagick/www/api/statistics.html
+share/doc/GraphicsMagick/www/api/texture.html
 share/doc/GraphicsMagick/www/api/transform.html
 share/doc/GraphicsMagick/www/api/types.html
 share/doc/GraphicsMagick/www/api/types.rst
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 9fb687e7ab5..bba641450f3 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.19 2009/08/08 04:45:28 obache Exp $
+$NetBSD: distinfo,v 1.20 2009/09/20 11:30:58 obache Exp $
 
-SHA1 (GraphicsMagick-1.3.6.tar.gz) = f941448158a551865b7cf6f5230d3caa053cef36
-RMD160 (GraphicsMagick-1.3.6.tar.gz) = 4d745fb7529d423e34a721d437c3cc02dfdfa074
-Size (GraphicsMagick-1.3.6.tar.gz) = 7804177 bytes
-SHA1 (patch-ab) = f4e501afbfb5822a6803be76826e70de9a4cee15
+SHA1 (GraphicsMagick-1.3.7.tar.gz) = 0d6d25644af0d125e24be0a0ed830a5c5f472156
+RMD160 (GraphicsMagick-1.3.7.tar.gz) = 2bf58a91a5d3bb99e6bb35e3a2adc8da902b44f8
+Size (GraphicsMagick-1.3.7.tar.gz) = 7891141 bytes
diff --git a/graphics/GraphicsMagick/patches/patch-ab b/graphics/GraphicsMagick/patches/patch-ab
deleted file mode 100644
index 8ccda944408..00000000000
--- a/graphics/GraphicsMagick/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/08/08 04:41:08 obache Exp $
-
-Detect improper rows, columns, or depth.
-Fixes CVE-2008-1097 "Memory corruption in ImageMagick's PCX coder".
-
-http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/coders/pcx.c.diff?r1=1.135;r2=1.136
-
---- coders/pcx.c.orig	2008-11-07 17:36:01.000000000 +0000
-+++ coders/pcx.c
-@@ -302,6 +302,9 @@ static Image *ReadPCXImage(const ImageIn
-     */
-     image->columns=(pcx_info.right-pcx_info.left)+1;
-     image->rows=(pcx_info.bottom-pcx_info.top)+1;
-+    if ((image->columns == 0) || (image->rows == 0) ||
-+        (pcx_info.bits_per_pixel == 0))
-+      ThrowReaderException(CorruptImageError,ImproperImageHeader,image);
-     image->depth=pcx_info.bits_per_pixel <= 8 ? 8 : QuantumDepth;
-     image->units=PixelsPerInchResolution;
-     image->x_resolution=pcx_info.horizontal_resolution;