From 92c5b61c3c06f29b125b0dadd3cabcfab6b103d5 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 5 Sep 2011 14:33:10 +0000 Subject: [PATCH] --- MagickCore/Makefile.am | 2 +- MagickCore/magick-config.h | 42 ++++++++++++-------------------------- MagickCore/version.h | 4 ++-- Makefile.in | 4 ++-- config/configure.xml | 2 +- 5 files changed, 19 insertions(+), 35 deletions(-) diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am index cebf158c9..ee3094eff 100644 --- a/MagickCore/Makefile.am +++ b/MagickCore/Makefile.am @@ -193,7 +193,7 @@ MAGICKCORE_BASE_SRCS = \ MagickCore/property.h \ MagickCore/profile.c \ MagickCore/profile.h \ - MagickCore/profile-profile.h \ + MagickCore/profile-private.h \ MagickCore/quantize.c \ MagickCore/quantize.h \ MagickCore/quantum.c \ diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 60334d7b9..2726a74e3 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 @@ -80,9 +78,7 @@ #endif /* Define if you have FFTW library */ -#ifndef MAGICKCORE_FFTW_DELEGATE -#define MAGICKCORE_FFTW_DELEGATE 1 -#endif +/* #undef FFTW_DELEGATE */ /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -436,15 +432,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 */ @@ -1167,9 +1163,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 @@ -1198,9 +1192,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 @@ -1212,7 +1204,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:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/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/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1263,9 +1255,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 */ /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1320,9 +1310,7 @@ #endif /* Define if you have RSVG library */ -#ifndef MAGICKCORE_RSVG_DELEGATE -#define MAGICKCORE_RSVG_DELEGATE 1 -#endif +/* #undef RSVG_DELEGATE */ /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1459,9 +1447,7 @@ /* 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 */ @@ -1470,9 +1456,7 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -#ifndef MAGICKCORE_WMF_DELEGATE -#define MAGICKCORE_WMF_DELEGATE 1 -#endif +/* #undef WMF_DELEGATE */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 65c8f0f35..23d4b580d 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "exported" +#define MagickSVNRevision "5157" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 5,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 5 #define MagickLibMinInterface 5 -#define MagickReleaseDate "2011-09-04" +#define MagickReleaseDate "2011-09-05" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/Makefile.in b/Makefile.in index fce1366d8..24d35a259 100644 --- a/Makefile.in +++ b/Makefile.in @@ -435,7 +435,7 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST = \ MagickCore/PreRvIcccm.h MagickCore/prepress.c \ MagickCore/prepress.h MagickCore/property.c \ MagickCore/property.h MagickCore/profile.c \ - MagickCore/profile.h MagickCore/profile-profile.h \ + MagickCore/profile.h MagickCore/profile-private.h \ MagickCore/quantize.c MagickCore/quantize.h \ MagickCore/quantum.c MagickCore/quantum.h \ MagickCore/quantum-export.c MagickCore/quantum-import.c \ @@ -4002,7 +4002,7 @@ MAGICKCORE_BASE_SRCS = \ MagickCore/property.h \ MagickCore/profile.c \ MagickCore/profile.h \ - MagickCore/profile-profile.h \ + MagickCore/profile-private.h \ MagickCore/quantize.c \ MagickCore/quantize.h \ MagickCore/quantum.c \ diff --git a/config/configure.xml b/config/configure.xml index 6c637a2cb..9cd48577a 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + -- 2.40.0