From: cristy Date: Fri, 16 Oct 2009 20:13:48 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10505 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bf78be8716153517f39371c513aea73768cdaa2;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 6caa07d7a..da7d0f91a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.7 -%define Patchlevel 0 +%define Patchlevel 1 Name: ImageMagick Version: %{VERSION} diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 614982373..0368fcdc7 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -140,7 +140,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/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; -my $LIBS_magick = '-L../magick/.libs -lMagickCore -L../wand/.libs -lperl -lm'; +my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm'; my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread"; if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) { diff --git a/config/configure.xml b/config/configure.xml index 0fcbbb9a4..7798f9db0 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/libtool b/libtool index 128988a03..1562b988a 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-0 +# Generated automatically by config.status (ImageMagick) 6.5.7-1 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/version.h b/magick/version.h index e3daffd6c..b150b71a8 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,8 +30,8 @@ extern "C" { #define MagickLibVersion 0x657 #define MagickLibVersionText "6.5.7" #define MagickLibVersionNumber 2,0,0 -#define MagickLibSubversion "-0" -#define MagickReleaseDate "2009-10-15" +#define MagickLibSubversion "-1" +#define MagickReleaseDate "2009-10-16" #define MagickChangeDate "20091014" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.7/index.html" diff --git a/version.sh b/version.sh index 57d1cfb6e..2a6948c08 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="0" +PACKAGE_RELEASE="1" PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index f4562620a..657c41df2 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -164,7 +164,7 @@

ImageMagick provides a statically-built ImageMagick object as part of its Windows installation package. When this package is installed, ImageMagickObject and its sample programs are installed to this path:

-  c:\Program Files\ImageMagick-6.5.6-Q16\ImageMagickObject
+  c:\Program Files\ImageMagick-6.5.7-Q16\ImageMagickObject
 

The ImageMagickObject is registered if the checkbox, Register ImageMagickObject, is checked at install time.

@@ -207,7 +207,7 @@ Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index bd70dd946..baad8a6c5 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -123,7 +123,7 @@

Mac OS X-specific Build instructions

@@ -522,7 +522,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.6-10.tar.gz $magick> cd ImageMagick-6.5.6

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

+

$magick> tar xvfz ImageMagick-6.5.7-0.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:

@@ -551,7 +551,7 @@ Options used to compile and link:

Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

-

$magick> tar jxvf ImageMagick-6.5.6-?.tar.bz2 $magick> cd ImageMagick-6.5.6 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

+

$magick> tar jxvf ImageMagick-6.5.7-?.tar.bz2 $magick> cd ImageMagick-6.5.7 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 77a4e6b4b..9aa397be8 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -123,7 +123,7 @@
diff --git a/www/api.html b/www/api.html index 11ee33df7..2798fda14 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/attribute.html b/www/api/attribute.html index 260312b65..2fb72ce0b 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -123,7 +123,7 @@
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 7b6403ab6..70ac6be3b 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -123,7 +123,7 @@
diff --git a/www/api/cipher.html b/www/api/cipher.html index e19934162..2b2792cfc 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -123,7 +123,7 @@
diff --git a/www/api/composite.html b/www/api/composite.html index c800b7b05..a7f7af258 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -232,7 +232,7 @@ _8c.html" target="source" name="TextureImage">TextureImage Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 452669953..832585e03 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -2597,7 +2597,7 @@ _8c.html" target="source" name="UnshiftImageList">UnshiftImageList Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/display.html b/www/api/display.html index 9daf1d611..8698ae2dd 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -123,7 +123,7 @@
diff --git a/www/api/distort.html b/www/api/distort.html index 4fd4e4ccc..20007743e 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -257,7 +257,7 @@ _8c.html" target="source" name="SparseColorImage">SparseColorImage Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/draw.html b/www/api/draw.html index 164983a6b..ed1f438fa 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -123,7 +123,7 @@
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 2e28183c2..e7bad6b1d 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -3067,7 +3067,7 @@ _8c.html" target="source" name="PushDrawingWand">PushDrawingWand Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/effect.html b/www/api/effect.html index 6e55b4b79..a60f77332 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -688,7 +688,7 @@ _8c.html" target="source" name="UnsharpMaskImage">UnsharpMaskImage Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/histogram.html b/www/api/histogram.html index 4f4b4a931..53283bbad 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -308,7 +308,7 @@ _8c.html" target="source" name="UniqueImageColors">UniqueImageColors Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/image.html b/www/api/image.html index c3998ddca..a84cb0206 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -1008,7 +1008,7 @@ _8c.html" target="source" name="StripImage">StripImage Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/layer.html b/www/api/layer.html index 912f1dfc4..cec9abbd4 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -123,7 +123,7 @@