From: cristy Date: Tue, 20 Mar 2012 00:48:54 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6010 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df1e38278e663dac0ceab0171bbc96857a32df6c;p=imagemagick --- diff --git a/Install-unix.txt b/Install-unix.txt index 6b8579b48..e5d0df257 100644 --- a/Install-unix.txt +++ b/Install-unix.txt @@ -23,7 +23,7 @@ Configure default options, and build from within the source directory, you can simply type: - $magick> cd ImageMagick-6.5.9 + $magick> cd ImageMagick-7.0.0 $magick> ./configure Watch the configure script output to verify that it finds everything that @@ -576,7 +576,7 @@ Linux-specific Build instructions After the build you, locate the RPMS folder and install the ImageMagick binary RPM distribution: - $magick> rpm -ivh ImageMagick-6.5.9-?.*.rpm + $magick> rpm -ivh ImageMagick-7.0.0-?.*.rpm MinGW-specific Build instructions @@ -586,8 +586,8 @@ MinGW-specific Build instructions sure you specify the development headers when you install a package. Next type, - $magick> tar jxvf ImageMagick-6.5.9-?.tar.bz2 - $magick> cd ImageMagick-6.5.9 + $magick> tar jxvf ImageMagick-7.0.0-?.tar.bz2 + $magick> cd ImageMagick-7.0.0 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl diff --git a/MagickCore/version.h b/MagickCore/version.h index c0f2c1726..d168cce65 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 "7154" +#define MagickSVNRevision "7163" #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-03-18" +#define MagickReleaseDate "2012-03-19" #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 49400822b..720a4c965 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-18 + 2012-03-19 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-03-18 + 2012-03-19 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index ea82c07f4..5c8b4293d 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index b7302d43f..1f11cedb4 100755 --- a/configure +++ b/configure @@ -866,6 +866,8 @@ MODULE_EXTRA_CPPFLAGS LIBSTDCLDFLAGS PERL_MAKE_OPTIONS QUANTUM_DEPTH +LEGACY_SUPPORT_FALSE +LEGACY_SUPPORT_TRUE MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -1125,6 +1127,7 @@ enable_prof enable_gprof enable_gcov with_method_prefix +enable_legacy_support with_quantum_depth with_cache with_frozenpaths @@ -1857,6 +1860,7 @@ Optional Features: --enable-prof enable 'prof' profiling support --enable-gprof enable 'gprof' profiling support --enable-gcov enable 'gcov' profiling support + --enable-legacy-support install ImageMagick utility shortcuts (default disabled) --disable-assert turn off assertions Optional Packages: @@ -3616,7 +3620,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=7154 +MAGICK_SVN_REVISION=7163 @@ -21871,6 +21875,23 @@ _ACEOF DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix " fi +# Enable ImageMagick utilities legacy support (default no) +# Check whether --enable-legacy-support was given. +if test "${enable_legacy_support+set}" = set; then : + enableval=$enable_legacy_support; with_legacy_support=$enableval +else + with_legacy_support='no' +fi + + if test "$with_legacy_support" != 'no'; then + LEGACY_SUPPORT_TRUE= + LEGACY_SUPPORT_FALSE='#' +else + LEGACY_SUPPORT_TRUE='#' + LEGACY_SUPPORT_FALSE= +fi + + # Number of bits in a Quantum # Check whether --with-quantum-depth was given. @@ -35917,6 +35938,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LEGACY_SUPPORT_TRUE}" && test -z "${LEGACY_SUPPORT_FALSE}"; then + as_fn_error $? "conditional \"LEGACY_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.