From: cristy Date: Sun, 17 Jun 2012 14:07:18 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5420 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8be341436c1d50127c31ce5f3c3f131e5c0846aa;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index 8d53ea456..31c70eeb9 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "8282" +#define MagickSVNRevision "8297" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-06-16" +#define MagickReleaseDate "2012-06-17" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 0e401d5a1..316c0f910 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-06-16 + 2012-06-17 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-06-16 + 2012-06-17 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index fb7ceb21e..9a7e3c6d3 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 4e1a2f6b3..acf399ff1 100755 --- a/configure +++ b/configure @@ -3633,6 +3633,7 @@ test -n "$target_alias" && + MAGICK_TARGET_CPU=$host_cpu @@ -3647,7 +3648,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=8282 +MAGICK_SVN_REVISION=8297 diff --git a/configure.ac b/configure.ac index 8699babf2..566fd7c39 100755 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}" AC_CANONICAL_SYSTEM AC_CANONICAL_BUILD AC_CANONICAL_HOST +AC_CANONICAL_TARGET MAGICK_TARGET_CPU=$host_cpu AC_SUBST(MAGICK_TARGET_CPU)