Changes 6.6.9.8:

* Fixed some cut-and-paste errors in new png.c code that caused PNG8
  reductions to fail.

Changes 6.6.9.8:
* Add various Option Flags, and fix option skip counts for plus forms
  of simple operators where plus form is the same as minus form.
  For example the incorrect counts produces a weird error, and posible
  future segmentation fault in a command like  convert rose: +border show:

Changes 6.6.9.7:
* Fix FX default for interpolation to Bilinear.
* Fix pixel interpolation for -draw image over (reference
  http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18612).
* Write the proper bKGD chunk value in grayscale PNG images (reference
  http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18624).
* Added Inverse method for Sparse Color Interpolation

1 files changed, 94 insertions, 22 deletions

diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 1a12c20ff91..d8b20cfd3a6 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.68 2010/12/14 10:08:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.69 2011/05/11 11:38:48 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -139,16 +139,6 @@ include/ImageMagick/wand/pixel-iterator.h
 include/ImageMagick/wand/pixel-wand.h
 include/ImageMagick/wand/stream.h
 include/ImageMagick/wand/wand-view.h
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/francais.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/locale.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/policy.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-dejavu.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-ghostscript.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-windows.xml
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type.xml
 lib/libMagick++.la
 lib/libMagickCore.la
 lib/libMagickWand.la
@@ -175,16 +165,13 @@ man/man1/import.1
 man/man1/mogrify.1
 man/man1/montage.1
 man/man1/stream.1
-share/ImageMagick-${IM_MAJOR_VER}/ChangeLog
-share/ImageMagick-${IM_MAJOR_VER}/LICENSE
-share/ImageMagick-${IM_MAJOR_VER}/NEWS.txt
-share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml
-share/ImageMagick-${IM_MAJOR_VER}/config/colors.xml
-share/ImageMagick-${IM_MAJOR_VER}/config/log.xml
-share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml
-share/ImageMagick-${IM_MAJOR_VER}/config/mime.xml
-share/ImageMagick-${IM_MAJOR_VER}/config/sRGB.icm
-share/ImageMagick-${IM_MAJOR_VER}/config/thresholds.xml
+share/ImageMagick-${IM_MAJOR_VER}/configure.xml
+share/ImageMagick-${IM_MAJOR_VER}/english.xml
+share/ImageMagick-${IM_MAJOR_VER}/francais.xml
+share/ImageMagick-${IM_MAJOR_VER}/locale.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/ChangeLog
+share/doc/ImageMagick-${IM_MAJOR_VER}/LICENSE
+share/doc/ImageMagick-${IM_MAJOR_VER}/NEWS.txt
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/affine.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/arc.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/background.jpg
@@ -198,6 +185,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/configure.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/cylinder_shaded.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/definitive-guide.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/difference.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/donate.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/frame.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/fuzzy-magick.png
@@ -205,11 +193,68 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/gaussian-blur.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/granite.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/imade_art2.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/label.gif
-share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.eps
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo-sm-flop.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo-sm-fx.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo-sm.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/montage.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/navy.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/networkredux.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/bricks.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/checkerboard.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/circles.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch30.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch45.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/fishscales.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray0.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray10.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray100.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray15.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray20.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray25.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray30.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray35.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray40.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray45.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray5.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray50.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray55.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray60.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray65.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray70.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray75.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray80.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray85.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray90.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray95.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hexagons.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal2.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal3.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontalsaw.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_bdiagonal.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_cross.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_diagcross.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_fdiagonal.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_horizontal.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_vertical.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/left30.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/left45.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/leftshingle.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/octagons.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/right30.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/right45.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/rightshingle.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/smallfishscales.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical2.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical3.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalbricks.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalleftshingle.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalrightshingle.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalsaw.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/piechart.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/project-support.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/radial-gradient.png
@@ -229,7 +274,10 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/sprite.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/t-shirt.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/tricks.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.ico
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/white-highlight.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/wizard.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/wizard.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/index.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/ImageMagickObject.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Blob.html
@@ -711,6 +759,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__Ascii85Info.htm
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__BlobInfo.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__CacheInfo.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__CacheMethods.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__CacheView.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__ChannelStatistics.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__ChromaticityInfo.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__Cluster.html
@@ -1006,6 +1055,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/feature.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fourier.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/histogram.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image-view.html
@@ -1073,6 +1123,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/install-source.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/jp2.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/license.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/links.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick++.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-core.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-vector-graphics.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-wand.html
@@ -1084,6 +1135,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/mogrify.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/montage.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/motion-picture.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/perl-magick.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/porting.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/quantize.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/resources.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/search.html
@@ -1092,17 +1144,24 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/analyze.c
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/coder.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/colors.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/configure.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/contrast.c
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/core.c
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/delegates.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/english.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/examples.pl
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/francais.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/incantation.msl
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/locale.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/log.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/magic.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/mgk.c
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/mime.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/piechart.mvg
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/piechart.svg
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/policy.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/thresholds.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type-ghostscript.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type-windows.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/wand.c
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html
@@ -1110,5 +1169,18 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/wand.png
+share/examples/ImageMagick/coder.xml
+share/examples/ImageMagick/colors.xml
+share/examples/ImageMagick/delegates.xml
+share/examples/ImageMagick/log.xml
+share/examples/ImageMagick/magic.xml
+share/examples/ImageMagick/mime.xml
+share/examples/ImageMagick/policy.xml
+share/examples/ImageMagick/sRGB.icm
+share/examples/ImageMagick/thresholds.xml
+share/examples/ImageMagick/type-dejavu.xml
+share/examples/ImageMagick/type-ghostscript.xml
+share/examples/ImageMagick/type-windows.xml
+share/examples/ImageMagick/type.xml
 @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders
 @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters