(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index debef69e6f0ff55233fc5f1c611f24786bc86e28..7d810897c79f44319e27dfc029c61d56b7b54255 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
-%define VERSION  6.5.6
-%define Patchlevel  0
+%define VERSION  6.5.5
+%define Patchlevel  10
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 03199e7f00f22a48d7a9adace8a5fcbcdaf8c321..402057d055ad5c68f7117fd254d650dccac1ec38 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -40,7 +40,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo '6.5.6 Q16 '
+      echo '6.5.5 Q16 '
       ;;
     --cflags)
       echo "-I${includedir} -fopenmp"

diff --git a/Magick++/lib/ImageMagick++.pc b/Magick++/lib/ImageMagick++.pc
index 5a902733a9bb86c05dc6566459955989421540aa..f7a414e325e16c8b09a7cf6aa91cf4dec7bd3011 100644 (file)
--- a/Magick++/lib/ImageMagick++.pc
+++ b/Magick++/lib/ImageMagick++.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include/ImageMagick
 
 
 Name: ImageMagick++
-Version: 6.5.6
+Version: 6.5.5
 Description: Magick++ - C++ API for ImageMagick
 Requires: ImageMagick
 Libs: -L${libdir} -lMagick++

diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 7e4bad377f95a0553e428819b27601404d570ef3..15c867a54b186f9dfc6452d3a4dfd82731b705e3 100644 (file)
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -30,7 +30,7 @@ require AutoLoader;
       ConfigureError FatalErrorException
     );
 
-$VERSION = '6.5.6';
+$VERSION = '6.5.5';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()
@@ -109,7 +109,7 @@ It was originally developed to be used by CGI scripts for Web pages.
 
 A Web page has been set up for this extension. See:
 
-        file:///usr/local/share/doc/ImageMagick-6.5.6/www/perl-magick.html
+        file:///usr/local/share/doc/ImageMagick-6.5.5/www/perl-magick.html
         http://www.imagemagick.org/script/perl-magick.php
 
 =head1 AUTHOR

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 619d671029515a9627070b9311d62d32ba995fe6..05f8497f8b81c3956db6926c21f62ee67e5dc881 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -53,7 +53,7 @@ WriteMakefile
    'AUTHOR' => 'ImageMagick Studio LLC',
 
    # Module version
-   'VERSION' => '6.5.6',
+   'VERSION' => '6.5.5',
 
    # Preprocessor defines
    'DEFINE'    => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING' 

diff --git a/coders/pdf.c b/coders/pdf.c
index 4170971b03d2672584c0b19f65742c0c88ee1950..7e2b62c575eb9cc7425732cc405cc1916e7a8565 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -1417,9 +1417,9 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
         (void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n",
           MaxTextExtent);
         (void) WriteBlobString(image,buffer);
-        (void) FormatMagickString(buffer,MaxTextExtent,
-          "/DecodeParms [ << /K %s /Columns %ld /Rows %ld >> ]\n",
-          CCITTParam,image->columns,image->rows);
+        (void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << "
+          "/K %s /BlackIs1 true /Columns %ld /Rows %ld >> ]\n",CCITTParam,
+          image->columns,image->rows);
         break;
       }
       default:
@@ -1859,9 +1859,9 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
         (void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n",
           MaxTextExtent);
         (void) WriteBlobString(image,buffer);
-        (void) FormatMagickString(buffer,MaxTextExtent,
-          "/DecodeParms [ << /K %s /Columns %lu /Rows %lu >> ]\n",
-          CCITTParam,tile_image->columns,tile_image->rows);
+        (void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << "
+          "/K %s /BlackIs1 true /Columns %lu /Rows %lu >> ]\n",CCITTParam,
+          tile_image->columns,tile_image->rows);
         break;
       }
       default:

diff --git a/config/configure.xml b/config/configure.xml
index 71e0c9a56e0ab680f324e74e0c4e6037cf8da5a7..c6e243efc4f44f266300df5b7dc69512e5303135 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -7,13 +7,13 @@
 ]>
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
-  <configure name="LIB_VERSION" value="0x656"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,6,0"/>
+  <configure name="LIB_VERSION" value="0x655"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,5,10"/>
   <configure name="RELEASE_DATE" value="2009-09-12"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
-  <configure name="VERSION" value="6.5.6"/>
+  <configure name="VERSION" value="6.5.5"/>
   <configure name="CC" value="gcc -std=gnu99"/>
   <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -W -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>

diff --git a/configure b/configure
index c3c48ab9089c760238753a620364b4ab5e926f36..baff6230ccf1ec0b632c101ebee1b752b1694c89 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ImageMagick 6.5.6.
+# Generated by GNU Autoconf 2.63 for ImageMagick 6.5.5.
 #
 # Report bugs to <http://www.imagemagick.org>.
 #
@@ -749,8 +749,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='6.5.6'
-PACKAGE_STRING='ImageMagick 6.5.6'
+PACKAGE_VERSION='6.5.5'
+PACKAGE_STRING='ImageMagick 6.5.5'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
 
 ac_unique_file="magick/MagickCore.h"
@@ -1869,7 +1869,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ImageMagick 6.5.6 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 6.5.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1944,7 +1944,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 6.5.6:";;
+     short | recursive ) echo "Configuration of ImageMagick 6.5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -2148,7 +2148,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 6.5.6
+ImageMagick configure 6.5.5
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2162,7 +2162,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 6.5.6, which was
+It was created by ImageMagick $as_me 6.5.5, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -46586,7 +46586,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 6.5.6, which was
+This file was extended by ImageMagick $as_me 6.5.5, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -46649,7 +46649,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-ImageMagick config.status 6.5.6
+ImageMagick config.status 6.5.5
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index 19c46a9970c481b0c8b363646740091127f2b228..98935262c5c77a97f13a37edd0a91a5d2239acd8 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 #  Copyright (C) 2003 - 2008 GraphicsMagick Group
 
 AC_PREREQ(2.63)
-AC_INIT([ImageMagick],[6.5.6],[http://www.imagemagick.org],[ImageMagick])
+AC_INIT([ImageMagick],[6.5.5],[http://www.imagemagick.org],[ImageMagick])
 AC_CONFIG_SRCDIR([magick/MagickCore.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/libtool b/libtool
index b997668f4175f764657e062754a22a636c53d1b2..99779d85cb68f8d3f9146cc26dc12f24cfa95cfb 100755 (executable)
--- 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.6-0
+# Generated automatically by config.status (ImageMagick) 6.5.5-10
 # 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/ImageMagick.pc b/magick/ImageMagick.pc
index 3a2282fb0c152a62ccf064a39c74eb0db5d7ed53..72ce5d585f97df0cfb4ddade7d85161f045e18e5 100644 (file)
--- a/magick/ImageMagick.pc
+++ b/magick/ImageMagick.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include/ImageMagick
 
 Name: ImageMagick
 Description: ImageMagick - Convert, Edit, and Compose Images
-Version: 6.5.6
+Version: 6.5.5
 Libs: -L${libdir} -lMagickCore
 Cflags: -I${includedir} -fopenmp

diff --git a/magick/Magick-config b/magick/Magick-config
index a8c7e955190a260cce434885cd40fdd588b80773..9b859e05c9c8594de208d181807b4833fa1cced8 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -37,7 +37,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo '6.5.6 Q16 '
+      echo '6.5.5 Q16 '
       ;;
     --cflags)
       echo "-I${includedir} -fopenmp"

diff --git a/magick/magick-config.h b/magick/magick-config.h
index e12b9cf3fafff2d2e03b0901f469e38483914c6f..f794d96dc0b35ed9503cf474ff5c212165ebc770 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -36,23 +36,23 @@
 
 /* Location of coder modules */
 #ifndef MAGICKCORE_CODER_PATH 
-#define MAGICKCORE_CODER_PATH  "/usr/local/lib/ImageMagick-6.5.6/modules-Q16/coders/" 
+#define MAGICKCORE_CODER_PATH  "/usr/local/lib/ImageMagick-6.5.5/modules-Q16/coders/" 
 #endif
 
 /* Subdirectory of lib where coder modules are installed */
 #ifndef MAGICKCORE_CODER_RELATIVE_PATH 
-#define MAGICKCORE_CODER_RELATIVE_PATH  "ImageMagick-6.5.6/modules-Q16/coders" 
+#define MAGICKCORE_CODER_RELATIVE_PATH  "ImageMagick-6.5.5/modules-Q16/coders" 
 #endif
 
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH 
-#define MAGICKCORE_CONFIGURE_PATH  "/usr/local/lib/ImageMagick-6.5.6/config/" 
+#define MAGICKCORE_CONFIGURE_PATH  "/usr/local/lib/ImageMagick-6.5.5/config/" 
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.
    */
 #ifndef MAGICKCORE_CONFIGURE_RELATIVE_PATH 
-#define MAGICKCORE_CONFIGURE_RELATIVE_PATH  "ImageMagick-6.5.6/config" 
+#define MAGICKCORE_CONFIGURE_RELATIVE_PATH  "ImageMagick-6.5.5/config" 
 #endif
 
 /* Define if you have DJVU library */
@@ -62,7 +62,7 @@
 
 /* Directory where ImageMagick documents live. */
 #ifndef MAGICKCORE_DOCUMENTATION_PATH 
-#define MAGICKCORE_DOCUMENTATION_PATH  "/usr/local/share/doc/ImageMagick-6.5.6/" 
+#define MAGICKCORE_DOCUMENTATION_PATH  "/usr/local/share/doc/ImageMagick-6.5.5/" 
 #endif
 
 /* Define if you have Display Postscript */
@@ -87,12 +87,12 @@
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH 
-#define MAGICKCORE_FILTER_PATH  "/usr/local/lib/ImageMagick-6.5.6/modules-Q16/filters/" 
+#define MAGICKCORE_FILTER_PATH  "/usr/local/lib/ImageMagick-6.5.5/modules-Q16/filters/" 
 #endif
 
 /* Subdirectory of lib where filter modules are installed */
 #ifndef MAGICKCORE_FILTER_RELATIVE_PATH 
-#define MAGICKCORE_FILTER_RELATIVE_PATH  "ImageMagick-6.5.6/modules-Q16/filters" 
+#define MAGICKCORE_FILTER_RELATIVE_PATH  "ImageMagick-6.5.5/modules-Q16/filters" 
 #endif
 
 /* Define if you have FONTCONFIG library */
@@ -962,13 +962,13 @@
 
 /* Directory where architecture-dependent files live. */
 #ifndef MAGICKCORE_LIBRARY_PATH 
-#define MAGICKCORE_LIBRARY_PATH  "/usr/local/lib/ImageMagick-6.5.6/" 
+#define MAGICKCORE_LIBRARY_PATH  "/usr/local/lib/ImageMagick-6.5.5/" 
 #endif
 
 /* Subdirectory of lib where ImageMagick architecture dependent files are
    installed */
 #ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH 
-#define MAGICKCORE_LIBRARY_RELATIVE_PATH  "ImageMagick-6.5.6" 
+#define MAGICKCORE_LIBRARY_RELATIVE_PATH  "ImageMagick-6.5.5" 
 #endif
 
 /* Define if you have LQR library */
@@ -1039,7 +1039,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING 
-#define MAGICKCORE_PACKAGE_STRING  "ImageMagick 6.5.6" 
+#define MAGICKCORE_PACKAGE_STRING  "ImageMagick 6.5.5" 
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -1049,7 +1049,7 @@
 
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION 
-#define MAGICKCORE_PACKAGE_VERSION  "6.5.6" 
+#define MAGICKCORE_PACKAGE_VERSION  "6.5.5" 
 #endif
 
 /* Define if you have PNG library */
@@ -1096,18 +1096,18 @@
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHARE_CONFIGURE_PATH 
-#define MAGICKCORE_SHARE_CONFIGURE_PATH  "/usr/local/share/ImageMagick-6.5.6/config/" 
+#define MAGICKCORE_SHARE_CONFIGURE_PATH  "/usr/local/share/ImageMagick-6.5.5/config/" 
 #endif
 
 /* Subdirectory of lib where architecture-independent configuration files
    live. */
 #ifndef MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH 
-#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH  "ImageMagick-6.5.6/config" 
+#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH  "ImageMagick-6.5.5/config" 
 #endif
 
 /* Directory where architecture-independent files live. */
 #ifndef MAGICKCORE_SHARE_PATH 
-#define MAGICKCORE_SHARE_PATH  "/usr/local/share/ImageMagick-6.5.6/" 
+#define MAGICKCORE_SHARE_PATH  "/usr/local/share/ImageMagick-6.5.5/" 
 #endif
 
 /* The size of `off_t', as computed by sizeof. */

diff --git a/magick/version.h b/magick/version.h
index fa24b5a72e04024834e2e4e13a5a423bd6e42465..169dcd51e2e778340b617483a12ed6acf0b778c6 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2009 ImageMagick Studio LLC"
-#define MagickLibVersion  0x656
-#define MagickLibVersionText  "6.5.6"
+#define MagickLibVersion  0x655
+#define MagickLibVersionText  "6.5.5"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-0"
+#define MagickLibSubversion  "-10"
 #define MagickReleaseDate  "2009-09-12"
 #define MagickChangeDate   "20090911"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
-#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.6/index.html"
+#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.5/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"
 #define MagickQuantumRange  "255"

diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index d6be2c8f8f3983413c9c0fe32aa3590aab28c056..d87c8cbb99132507e0cb3191a7467a12db309b7d 100644 (file)
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -61,9 +61,9 @@ saves any visible window on an X server and outputs it as an image file. You can
 
 interprets and executes scripts written in the Magick Scripting Language (MSL).
 .PP
-For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/index.html or http://www.imagemagick.org/.
 .SH SEE ALSO
 convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/animate.1 b/utilities/animate.1
index a9760afc5e4361ab38d098d32d2e752c9665c1b2..d6dab6f633bb2610f1950f00933caa717ca8d9b8 100644 (file)
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools.  Use it to animate an image or image sequence on any X server.
 
-For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/animate.html or http://www.imagemagick.org/script/animate.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -93,4 +93,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/compare.1 b/utilities/compare.1
index cc8b1091fecc0a438be2a1391e0f472ab31e216e..be2f3007645656fd9351a937485404f153acb7f1 100644 (file)
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image
 .SH OVERVIEW
 The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction.
 
-For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/compare.html or http://www.imagemagick.org/script/compare.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -63,4 +63,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/composite.1 b/utilities/composite.1
index e4b165209b3f3259c0d5b58a05b56ff8444f5ceb..6983dfddf44115b45e04fe0bfa41f7774d66bd5f 100644 (file)
--- a/utilities/composite.1
+++ b/utilities/composite.1
@@ -7,7 +7,7 @@ composite \-  overlaps one image over another.
 .SH OVERVIEW
 The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another.
 
-For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/composite.html or http://www.imagemagick.org/script/composite.php.
 .SH DESCRIPTION
 Image Settings:
   \-affine matrix       affine transform matrix
@@ -101,4 +101,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/conjure.1 b/utilities/conjure.1
index fe63b998e4fab83478c0a21cb5e72a367f7ef01e..c6496248260d8899422f974e75c8f3ddf1523e21 100644 (file)
--- a/utilities/conjure.1
+++ b/utilities/conjure.1
@@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu
 .SH OVERVIEW
 The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
 
-For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
 .SH DESCRIPTION
 Image Settings:
   \-monitor             monitor progress
@@ -31,4 +31,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/convert.1 b/utilities/convert.1
index cd89c7dc3519236b4a825d2a2d966ea7c39850d7..a86e4090d6cc9ed8fe51c783060300d00eabc24d 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop,
 .SH OVERVIEW
 The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
 
-For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/convert.html or http://www.imagemagick.org/script/convert.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -253,4 +253,4 @@ By default, the image format of `file' is determined by its magic number.  To sp
 ImageMagick(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/display.1 b/utilities/display.1
index d9e167cc7902c4a92ef068927bda6863d06c814e..adf9c50c83ce9255700398019ba074a63d833ad3 100644 (file)
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools.  Use it to display an image or image sequence on any X server.
 
-For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/display.html or http://www.imagemagick.org/script/display.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -125,4 +125,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/identify.1 b/utilities/identify.1
index 520b73476e9d8f56ff7ac3ff02679a7d3900d7f7..d5bd9114c38561b94586471ef39a086c29d259bf 100644 (file)
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files.
 .SH OVERVIEW
 The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools.  It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
 
-For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/identify.html or http://www.imagemagick.org/script/identify.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -56,4 +56,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/import.1 b/utilities/import.1
index dbe3b0482270a0db99c2dc6ccc20fc5d524615c5..94310a8e0d8558c6eda59a1e0890a932cb0e7482 100644 (file)
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil
 .SH OVERVIEW
 The \fBimport\fP program is a member of the ImageMagick(1) suite of tools.  Use it to capture some or all of an X server screen and save the image to a file.
 
-For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/import.html or http://www.imagemagick.org/script/import.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -92,4 +92,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 983c156509884fa7b63465fbc91da99e10f41a30..7497f9711d7a8352899b4d4418057a0d9f83f6fa 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join,
 .SH OVERVIEW
 The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools.  Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
 
-For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -256,4 +256,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/montage.1 b/utilities/montage.1
index f0732507b3e257b2600a4c5149d4b5353542bb7a..18b866482fb6e19cdefac8f60e116f5ce24a380d 100644 (file)
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im
 .SH OVERVIEW
 The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools.  Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
 
-For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/montage.html or http://www.imagemagick.org/script/montage.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -121,4 +121,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/stream.1 b/utilities/stream.1
index 3b34905f9eab78b3f1d4d56322cc6812287b6cbc..048507bec9927f9a00c6d17c049126713328d99c 100644 (file)
--- a/utilities/stream.1
+++ b/utilities/stream.1
@@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image
 .SH OVERVIEW
 \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.  It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
 
-For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.6/www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-6.5.5/www/stream.html or http://www.imagemagick.org/script/stream.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -53,4 +53,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.6/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2009 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.5.5/www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/version.sh b/version.sh
index 67a1c95d691a45b7863605d8bee9e4d305dffe2d..6c00462ef2f335349025725315fae8e1b7f7f85d 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -10,10 +10,10 @@ PACKAGE_NAME='ImageMagick'
 #
 # Package version.  This is is the numeric version suffix applied to
 # PACKAGE_NAME (e.g. "1.0.0").
-PACKAGE_VERSION='6.5.6'
-PACKAGE_LIB_VERSION="0x656"
-PACKAGE_RELEASE="0"
-PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}"
+PACKAGE_VERSION='6.5.5'
+PACKAGE_LIB_VERSION="0x655"
+PACKAGE_RELEASE="10"
+PACKAGE_LIB_VERSION_NUMBER="6,5,5,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
 

diff --git a/wand/Wand-config b/wand/Wand-config
index 8f6fb582038742bc8826c53ccbfb20c819959757..5cb07a22c6eff7f87a8eb41bb6ecbcfa01821893 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -37,7 +37,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo '6.5.6 Q16 '
+      echo '6.5.5 Q16 '
       ;;
     --cflags)
       echo "-I${includedir} -fopenmp"

diff --git a/wand/Wand.pc b/wand/Wand.pc
index dc598abe4059ef8f89d5ac1b311cc99ad83d8345..585e0b021110d453fc1ff45c45f1585561050c1b 100644 (file)
--- a/wand/Wand.pc
+++ b/wand/Wand.pc
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include/ImageMagick
 
 Name: Wand
-Version: 6.5.6
+Version: 6.5.5
 Description:  MagickWand - C API for ImageMagick
 Requires: ImageMagick
 Libs: -L${libdir} -lMagickWand -lMagickCore