From: cristy Date: Mon, 7 Jun 2010 14:21:10 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9250 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8542c85ac0fbc675b0f3c0f992cff5a83971f54a;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 831c1dc7e..b6b36d51e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.2 -%define Patchlevel 4 +%define Patchlevel 3 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/tests/montageImages.cpp b/Magick++/tests/montageImages.cpp index 482f14b62..3e3e63d32 100644 --- a/Magick++/tests/montageImages.cpp +++ b/Magick++/tests/montageImages.cpp @@ -44,7 +44,7 @@ int main( int /*argc*/, char ** /*argv*/) montageImages( &montage, imageList.begin(), imageList.end(), montageOpts ); { - Geometry targetGeometry(128, 126 ); + Geometry targetGeometry(120, 120 ); if ( montage[0].montageGeometry() != targetGeometry ) { ++failures; @@ -58,7 +58,7 @@ int main( int /*argc*/, char ** /*argv*/) } } - if ( montage[0].columns() != 768 || montage[0].rows() != 504 ) + if ( montage[0].columns() != 720 || montage[0].rows() != 480 ) { ++failures; cout << "Line: " << __LINE__ @@ -93,7 +93,7 @@ int main( int /*argc*/, char ** /*argv*/) } { - Geometry targetGeometry( 66, 70 ); + Geometry targetGeometry( 62, 66 ); if ( montage[0].montageGeometry() != targetGeometry ) { ++failures; @@ -107,7 +107,7 @@ int main( int /*argc*/, char ** /*argv*/) } } - if ( montage[0].columns() != 136 || montage[0].rows() != 70 ) + if ( montage[0].columns() != 128 || montage[0].rows() != 66 ) { ++failures; cout << "Line: " << __LINE__ diff --git a/config/configure.xml b/config/configure.xml index a9d4a2b95..344c9685e 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 234ee1c7b..43c01d960 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.2-4 +# Generated automatically by config.status (ImageMagick) 6.6.2-3 # 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 b41ea93af..c2d152bb3 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x662 #define MagickLibVersionText "6.6.2" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-4" +#define MagickLibAddendum "-3" #define MagickLibInterface 3 #define MagickLibMinInterface 3 #define MagickReleaseDate "2010-06-07" diff --git a/version.sh b/version.sh index 9e2ef6212..f4475f487 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.2' PACKAGE_LIB_VERSION="0x662" -PACKAGE_RELEASE="4" +PACKAGE_RELEASE="3" PACKAGE_LIB_VERSION_NUMBER="6,6,2,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"