From: cristy Date: Mon, 26 Oct 2009 20:05:17 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10450 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e63781385b754d3ff08560e20ee6897bbb6b6e0f;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index adbe6d2d5..303d8d0ff 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.7 -%define Patchlevel 2 +%define Patchlevel 3 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 9922d392c..7ad0467eb 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 -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread " + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index ff66edadf..8b90a3099 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 djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml zlib/) { +foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib/) { if ( -d "t/$delegate" ) { if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) { if ( defined $ENV{'DISPLAY'} ) { @@ -138,7 +138,7 @@ foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg } # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile -my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; +my $INC_magick = '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm'; my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread"; my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; @@ -183,7 +183,7 @@ WriteMakefile #'CC' => 'gcc -std=gnu99', # C pre-processor flags (e.g. -I & -D options) - # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2", + # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2 -I/usr/include/libxml2", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, diff --git a/config/configure.xml b/config/configure.xml index 1e35dee2e..4d71eb2f3 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,9 +8,9 @@ - - - + + + @@ -20,12 +20,12 @@ - + - + - + diff --git a/index.html b/index.html index 75e2d46bf..898c83388 100644 --- a/index.html +++ b/index.html @@ -123,7 +123,7 @@
diff --git a/libtool b/libtool index 1e18fd398..23e67186c 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.5.7-2 +# Generated automatically by config.status (ImageMagick) 6.5.7-3 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -67,7 +67,7 @@ DLLTOOL=dlltool OBJDUMP=objdump # Whether or not to build shared libraries. -build_libtool_libs=no +build_libtool_libs=yes # Whether or not to build static libraries. build_old_libs=yes @@ -76,7 +76,7 @@ build_old_libs=yes pic_mode=default # Whether or not to optimize for fast installation. -fast_install=needless +fast_install=yes # The host system. host_alias= @@ -287,7 +287,7 @@ link_static_flag="" compiler_c_o="yes" # Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes +build_libtool_need_lc=no # Whether or not to disallow shared libs when runtime libs are static. allow_libtool_libs_with_static_runtimes=no diff --git a/magick/Magick-config b/magick/Magick-config index b91b75d91..b559441af 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread " + echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/magick/magick-config.h b/magick/magick-config.h index 483c2327f..489fde941 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -12,7 +12,9 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -/* #undef BUILD_MODULES */ +#ifndef MAGICKCORE_BUILD_MODULES +#define MAGICKCORE_BUILD_MODULES 1 +#endif /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -987,7 +989,9 @@ /* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ -/* #undef LTDL_DELEGATE */ +#ifndef MAGICKCORE_LTDL_DELEGATE +#define MAGICKCORE_LTDL_DELEGATE 1 +#endif /* Define if the OS needs help to load dependent libraries for dlopen(). */ /* #undef LTDL_DLOPEN_DEPLIBS */ @@ -1225,7 +1229,9 @@ /* #undef WITH_DMALLOC */ /* Define if you have wmflite library */ -/* #undef WMFLITE_DELEGATE */ +#ifndef MAGICKCORE_WMFLITE_DELEGATE +#define MAGICKCORE_WMFLITE_DELEGATE 1 +#endif /* Define if you have wmf library */ /* #undef WMF_DELEGATE */ diff --git a/magick/version.h b/magick/version.h index 7b4c34112..48b6cb7ac 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,9 +30,9 @@ extern "C" { #define MagickLibVersion 0x657 #define MagickLibVersionText "6.5.7" #define MagickLibVersionNumber 2,0,0 -#define MagickLibSubversion "-2" -#define MagickReleaseDate "2009-10-24" -#define MagickChangeDate "20091023" +#define MagickLibSubversion "-3" +#define MagickReleaseDate "2009-10-26" +#define MagickChangeDate "20091026" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/version.sh b/version.sh index 52033443b..cadc1721b 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.7' PACKAGE_LIB_VERSION="0x657" -PACKAGE_RELEASE="2" +PACKAGE_RELEASE="3" PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/wand/Wand-config b/wand/Wand-config index 834f03a1e..6f9c20c37 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread " + echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index b10672fe2..657c41df2 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -124,7 +124,7 @@
@@ -522,7 +523,7 @@ Options used to compile and link:

Download the ImageMagick source distribution and verify the distribution against its message digest.

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.5.7-1.tar.gz $magick> cd ImageMagick-6.5.7

Choose an architecture and set your CFLAGS environment variable. Here we set CFLAGS for an Intel build:

+

$magick> tar xvfz ImageMagick-6.5.7-2.tar.gz $magick> cd ImageMagick-6.5.7

Choose an architecture and set your CFLAGS environment variable. Here we set CFLAGS for an Intel build:

$magick> export CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.5.sdk/ \
-arch i386 -I/sw/include/"

Set your LDFLAGS environment variable to:

$magick> export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk/,-L/sw/lib/"

Configure ImageMagick:

@@ -597,7 +598,7 @@ Options used to compile and link: Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index ab9ad4a15..abd3b80c6 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -427,7 +427,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.5.7-1-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.5.7-2-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index 4395f22a7..8b5c82f24 100644 --- a/www/animate.html +++ b/www/animate.html @@ -607,7 +607,7 @@ transparent, extract, background, or shape the alpha channel Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api.html b/www/api.html index 67d45c02d..4c2ce0d28 100644 --- a/www/api.html +++ b/www/api.html @@ -159,7 +159,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -171,7 +171,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -183,31 +183,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -221,7 +221,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -233,50 +233,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagick an object-oriented Python interface to ImageMagick.

+

PythonMagick an object-oriented Python interface to ImageMagick.

-

PythonMagickWand an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand an object-oriented Python interface to MagickWand based on ctypes.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index 0fba7b415..3d516a3e5 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -183,7 +183,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/blob.html b/www/api/blob.html index e4c588323..c73cfaebd 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -343,7 +343,7 @@ _8c.html" target="source" name="InjectImageBlob">InjectImageBlob Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/cipher.html b/www/api/cipher.html index dc87947b3..e19934162 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -355,7 +355,7 @@ _8c.html" target="source" name="PasskeyEncipherImage">PasskeyEncipherImage Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/decorate.html b/www/api/decorate.html index 29d789006..e3f5c7297 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -123,7 +123,7 @@
diff --git a/www/sponsors.html b/www/sponsors.html index bf5af0600..01002724a 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -123,7 +123,7 @@
diff --git a/www/subversion.html b/www/subversion.html index 4b5f5c903..b0366d4f9 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -176,7 +176,7 @@ ImageMagick-6.5.7

Discourse ServerMailing Lists • - Studio + Studio