From 851dbceb0a51cbcd3ed512f074e9f2d797b7cbc1 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 6 Aug 2010 21:40:00 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- Magick++/bin/Magick++-config | 2 +- PerlMagick/Makefile.PL | 2 +- config/configure.xml | 8 +- index.html | 6 +- libtool | 2 +- magick/Magick-config | 2 +- magick/magick-config.h | 4 +- magick/version.h | 6 +- version.sh | 2 +- wand/Wand-config | 2 +- www/ImageMagickObject.html | 4 +- www/advanced-unix-installation.html | 12 +- www/advanced-windows-installation.html | 6 +- www/animate.html | 4 +- www/api.html | 46 +-- www/api/animate.html | 6 +- www/api/annotate.html | 4 +- www/api/attribute.html | 6 +- www/api/blob.html | 6 +- www/api/cache-view.html | 4 +- www/api/cache.html | 6 +- www/api/cipher.html | 4 +- www/api/color.html | 64 +++- www/api/colormap.html | 6 +- www/api/compare.html | 6 +- www/api/composite.html | 6 +- www/api/constitute.html | 4 +- www/api/decorate.html | 4 +- www/api/deprecate.html | 7 +- www/api/display.html | 6 +- www/api/distort.html | 6 +- www/api/draw.html | 6 +- www/api/drawing-wand.html | 4 +- www/api/effect.html | 4 +- www/api/enhance.html | 4 +- www/api/exception.html | 7 +- www/api/feature.html | 4 +- www/api/fx.html | 4 +- www/api/histogram.html | 6 +- www/api/image-view.html | 4 +- www/api/image.html | 6 +- www/api/layer.html | 6 +- www/api/list.html | 7 +- www/api/magick-deprecate.html | 6 +- www/api/magick-image.html | 7 +- www/api/magick-property.html | 6 +- www/api/magick-wand.html | 6 +- www/api/magick.html | 6 +- www/api/memory.html | 6 +- www/api/module.html | 6 +- www/api/monitor.html | 6 +- www/api/montage.html | 4 +- www/api/morphology.html | 6 +- www/api/paint.html | 6 +- www/api/pixel-iterator.html | 4 +- www/api/pixel-wand.html | 6 +- www/api/profile.html | 6 +- www/api/property.html | 6 +- www/api/quantize.html | 4 +- www/api/registry.html | 6 +- www/api/resize.html | 4 +- www/api/resource.html | 4 +- www/api/segment.html | 4 +- www/api/shear.html | 6 +- www/api/signature.html | 6 +- www/api/statistic.html | 4 +- www/api/stream.html | 6 +- www/api/transform.html | 4 +- www/api/version.html | 6 +- www/api/wand-view.html | 6 +- www/architecture.html | 8 +- www/binary-releases.html | 58 ++-- www/changelog.html | 17 +- www/cipher.html | 4 +- www/color.html | 6 +- www/command-line-options.html | 12 +- www/command-line-processing.html | 6 +- www/command-line-tools.html | 8 +- www/compare.html | 4 +- www/composite.html | 7 +- www/conjure.html | 6 +- www/contact.html | 8 +- www/convert.html | 6 +- www/display.html | 6 +- www/download.html | 8 +- www/escape.html | 4 +- www/examples.html | 9 +- www/exception.html | 6 +- www/formats.html | 4 +- www/fx.html | 6 +- www/high-dynamic-range.html | 6 +- www/history.html | 6 +- www/identify.html | 8 +- www/import.html | 6 +- www/index.html | 6 +- www/install-source.html | 4 +- www/jp2.html | 6 +- www/license.html | 4 +- www/links.html | 98 +++--- www/magick-core.html | 4 +- www/magick-vector-graphics.html | 6 +- www/magick-wand.html | 4 +- www/miff.html | 4 +- www/mirrors.html | 8 +- www/mogrify.html | 6 +- www/montage.html | 6 +- www/motion-picture.html | 4 +- www/perl-magick.html | 7 +- www/quantize.html | 7 +- www/resources.html | 4 +- www/search.html | 7 +- www/sitemap.html | 54 +-- www/source/examples.pl | 460 ++++++++++++++++++++++++- www/sponsors.html | 7 +- www/stream.html | 4 +- www/subversion.html | 6 +- www/t-shirt.html | 6 +- 118 files changed, 1067 insertions(+), 338 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 4a4c72cff2..35e2a46d1a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.3 -%global Patchlevel 3 +%global Patchlevel 4 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index e5d5e7e33d..1542f513f8 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -55,7 +55,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljpeg -lpng -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index acdaced03e..7be393a74a 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -125,7 +125,7 @@ EOF # Compute test specification my $delegate_tests='t/*.t'; my $delegate; -foreach $delegate (qw/bzlib fontconfig freetype jpeg jng png tiff x11 xml zlib/) { +foreach $delegate (qw/bzlib fontconfig freetype jpeg jng png tiff x11 xml wmf zlib/) { if ( -d "t/$delegate" ) { if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) { if ( defined $ENV{'DISPLAY'} ) { diff --git a/config/configure.xml b/config/configure.xml index daf747f142..ce70e09a4d 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + @@ -20,12 +20,12 @@ - + - + diff --git a/index.html b/index.html index 90965a57f1..69b40e383c 100644 --- a/index.html +++ b/index.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -139,7 +142,7 @@ Druckerei Online
@@ -149,7 +152,6 @@