From ceb488ff067dfa46bd473b0ef595eaf43daa1d6e Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 22 Mar 2012 10:58:48 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 46 ++++++++++++-------------------------- MagickCore/version.h | 4 ++-- Makefile.in | 2 -- config/ImageMagick.rdf | 4 ++-- config/configure.xml | 4 ++-- configure | 2 +- utilities/Makefile.am | 1 - 7 files changed, 21 insertions(+), 42 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index db62b5f5a..6c325993c 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,9 +12,7 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -#ifndef MAGICKCORE_BUILD_MODULES -#define MAGICKCORE_BUILD_MODULES 1 -#endif +/* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -97,9 +95,7 @@ #endif /* Define if you have FlashPIX library */ -#ifndef MAGICKCORE_FPX_DELEGATE -#define MAGICKCORE_FPX_DELEGATE 1 -#endif +/* #undef FPX_DELEGATE */ /* Define if you have FreeType (TrueType font) library */ #ifndef MAGICKCORE_FREETYPE_DELEGATE @@ -223,9 +219,7 @@ #endif /* Define to 1 if you have the header file. */ -#ifndef MAGICKCORE_HAVE_CL_CL_H -#define MAGICKCORE_HAVE_CL_CL_H 1 -#endif +/* #undef HAVE_CL_CL_H */ /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -448,15 +442,15 @@ #endif /* Define if you have the header file. */ -/* #undef HAVE_LCMS2_H */ +#ifndef MAGICKCORE_HAVE_LCMS2_H +#define MAGICKCORE_HAVE_LCMS2_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS_H -#define MAGICKCORE_HAVE_LCMS_H 1 -#endif +/* #undef HAVE_LCMS_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1194,9 +1188,7 @@ #endif /* Define if you have JBIG library */ -#ifndef MAGICKCORE_JBIG_DELEGATE -#define MAGICKCORE_JBIG_DELEGATE 1 -#endif +/* #undef JBIG_DELEGATE */ /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1225,9 +1217,7 @@ #endif /* Define if you have LQR library */ -#ifndef MAGICKCORE_LQR_DELEGATE -#define MAGICKCORE_LQR_DELEGATE 1 -#endif +/* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1239,7 +1229,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/usr/lib64/freetype-freeworld:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1293,9 +1283,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -#ifndef MAGICKCORE_OPENEXR_DELEGATE -#define MAGICKCORE_OPENEXR_DELEGATE 1 -#endif +/* #undef OPENEXR_DELEGATE */ /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1523,9 +1511,7 @@ #endif /* Define if you have WEBP library */ -#ifndef MAGICKCORE_WEBP_DELEGATE -#define MAGICKCORE_WEBP_DELEGATE 1 -#endif +/* #undef WEBP_DELEGATE */ /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ @@ -1534,9 +1520,7 @@ /* #undef WITH_DMALLOC */ /* Define if you have wmflite library */ -#ifndef MAGICKCORE_WMFLITE_DELEGATE -#define MAGICKCORE_WMFLITE_DELEGATE 1 -#endif +/* #undef WMFLITE_DELEGATE */ /* Define if you have wmf library */ /* #undef WMF_DELEGATE */ @@ -1595,9 +1579,7 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -#ifndef MAGICKCORE__OPENCL -#define MAGICKCORE__OPENCL 1 -#endif +/* #undef _OPENCL */ /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 3284079ef..87fbb85ae 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 "exported" +#define MagickSVNRevision "7202" #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-21" +#define MagickReleaseDate "2012-03-22" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/Makefile.in b/Makefile.in index 06557993b..ef5952bcf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1774,7 +1774,6 @@ ltdl_shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @LEGACY_SUPPORT_FALSE@ utilities/compare$(EXEEXT) \ @LEGACY_SUPPORT_FALSE@ utilities/composite$(EXEEXT) \ @LEGACY_SUPPORT_FALSE@ utilities/conjure$(EXEEXT) \ -@LEGACY_SUPPORT_FALSE@ utilities/convert$(EXEEXT) \ @LEGACY_SUPPORT_FALSE@ utilities/display$(EXEEXT) \ @LEGACY_SUPPORT_FALSE@ utilities/identify$(EXEEXT) \ @LEGACY_SUPPORT_FALSE@ utilities/import$(EXEEXT) \ @@ -4848,7 +4847,6 @@ filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) @LEGACY_SUPPORT_FALSE@ utilities/compare \ @LEGACY_SUPPORT_FALSE@ utilities/composite \ @LEGACY_SUPPORT_FALSE@ utilities/conjure \ -@LEGACY_SUPPORT_FALSE@ utilities/convert \ @LEGACY_SUPPORT_FALSE@ utilities/display \ @LEGACY_SUPPORT_FALSE@ utilities/identify \ @LEGACY_SUPPORT_FALSE@ utilities/import \ diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 75f75d325..6e01616a6 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-20 + 2012-03-22 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-20 + 2012-03-22 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index d520f0c06..f238adfbe 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index fd6f515aa..3d4de99d1 100755 --- a/configure +++ b/configure @@ -3620,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=7178 +MAGICK_SVN_REVISION=7202 diff --git a/utilities/Makefile.am b/utilities/Makefile.am index 4f1e72813..35cbcf414 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -34,7 +34,6 @@ UTILITIES_PGMS = \ utilities/compare \ utilities/composite \ utilities/conjure \ - utilities/convert \ utilities/display \ utilities/identify \ utilities/import \ -- 2.40.0