From: cristy Date: Thu, 8 Apr 2010 00:33:24 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9681 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=031b7a8a57a9de85199ff183e9a452692346cce6;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index c2669f3c9..95daa8abc 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.1 -%define Patchlevel 1 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index da11896d5..a347ac949 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index 92ae69d4b..abf4cd526 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@
diff --git a/libtool b/libtool index 6b7a4f2d4..fce435f6e 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.6.1-1 +# Generated automatically by config.status (ImageMagick) 6.6.1-2 # 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 3bc1ec7f2..818adaa53 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,11 +30,11 @@ extern "C" { #define MagickLibVersion 0x661 #define MagickLibVersionText "6.6.1" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-1" +#define MagickLibAddendum "-2" #define MagickLibInterface 3 #define MagickLibMinInterface 3 -#define MagickReleaseDate "2010-04-04" -#define MagickChangeDate "20100331" +#define MagickReleaseDate "2010-04-07" +#define MagickChangeDate "20100406" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.1/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/version.sh b/version.sh index 3db5a94f6..f06712c9d 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.1' PACKAGE_LIB_VERSION="0x661" -PACKAGE_RELEASE="1" +PACKAGE_RELEASE="2" PACKAGE_LIB_VERSION_NUMBER="6,6,1,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 125f17bfd..dc3263018 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -176,7 +176,7 @@

The configure script looks at your environment and decides what it can cobble together to get ImageMagick compiled and installed on your system. This includes finding a compiler, where your compiler header files are located (e.g. stdlib.h), and if any delegate libraries are available for ImageMagick to use (e.g. JPEG, PNG, TIFF, etc.). If you are willing to accept configure's default options, and build from within the source directory, you can simply type:

-

$magick> cd ImageMagick-6.6.1-0 $magick> ./configure

+

$magick> cd ImageMagick-6.6.1-1 $magick> ./configure

Watch the configure script output to verify that it finds everything that you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:

@@ -528,7 +528,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.6.1-0.tar.gz $magick> cd ImageMagick-6.6.1-0

Configure ImageMagick:

+

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

Configure ImageMagick:

$magick> ./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -548,7 +548,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.6.1-?.tar.bz2 $magick> cd ImageMagick-6.6.1-0 $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.6.1-?.tar.bz2 $magick> cd ImageMagick-6.6.1-1 $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 0bde9e5e0..12d11f6a3 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -428,7 +428,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.1-0-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.1-1-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
@@ -483,7 +483,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/animate.html b/www/animate.html index 4c038eef9..252f390d5 100644 --- a/www/animate.html +++ b/www/animate.html @@ -125,7 +125,7 @@
-

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

@@ -172,7 +172,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+

@@ -184,31 +184,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

@@ -222,7 +222,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

@@ -234,50 +234,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

-

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

+

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

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

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.

@@ -285,7 +285,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/api/animate.html b/www/api/animate.html index a8c0f39ee..cfa8e5610 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -124,7 +124,7 @@
diff --git a/www/api/annotate.html b/www/api/annotate.html index bf81e03cd..91f62ca90 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -124,7 +124,7 @@
diff --git a/www/api/attribute.html b/www/api/attribute.html index 65122d812..48dc17c4f 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -330,7 +330,7 @@ _8c.html" target="source" name="SetImageChannelDepth">SetImageChannelDepth  --> Discourse Server • - Studio + Studio  
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index ad568b97f..43b77f53f 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -576,7 +576,7 @@ _8c.html" target="source" name="SyncCacheViewAuthenticPixels">SyncCacheViewAuthe Discourse Server • - Studio + Studio  
diff --git a/www/api/cache.html b/www/api/cache.html index 5690e080c..4c643e95e 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -124,7 +124,7 @@
diff --git a/www/api/color.html b/www/api/color.html index d975fc269..28763f4b0 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -124,7 +124,7 @@