(no commit message)

diff --git a/MagickCore/configure-private.h b/MagickCore/configure-private.h
index 60ab33a1d6fe0c7e55761d6952dcaed351f8dc86..c35132b7b9feae697b707403973f7e4d56c2c591 100644 (file)
--- a/MagickCore/configure-private.h
+++ b/MagickCore/configure-private.h
@@ -15,8 +15,8 @@
 
   MagickCore private configure methods.
 */
-#ifndef _MAGICKCORE_CONFIGURE_H
-#define _MAGICKCORE_CONFIGURE_H
+#ifndef _MAGICKCORE_CONFIGURE_PRIVATE_H
+#define _MAGICKCORE_CONFIGURE_PRIVATE_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {

diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index 9f9ffd9cbd521a0dc14ca57fa79a7edcbb577c73..d19dc113badd7b8a48a9e4b66e9ace264dec0112 100644 (file)
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -34,6 +34,7 @@ extern MagickPrivate const char
   BackgroundColor[],
   BorderColor[],
   ForegroundColor[],
+  DefaultTileFrame[],
   MatteColor[];
 
 static inline double DegreesToRadians(const double degrees)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index d2bdf1544e3b1a8195687faa4f212c4f630897b7..ee0e334605fcc5c8f82e1742cbbf8631df950530 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -103,11 +103,11 @@
 MagickPrivate const char
   BackgroundColor[] = "#ffffff",  /* white */
   BorderColor[] = "#dfdfdf",  /* gray */
+  DefaultTileFrame[] = "15x15+3+3",
   ForegroundColor[] = "#000",  /* black */
   MatteColor[] = "#bdbdbd";  /* gray */
 
 MagickExport const char
-  DefaultTileFrame[] = "15x15+3+3",
   DefaultTileGeometry[] = "120x120+4+3>",
   DefaultTileLabel[] = "%f\n%G\n%b",
   LoadImageTag[] = "Load/Image",

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 9282779b23283e5ec38fc415df65fda1df14758d..23dd630f154c14152f9f6d658926b099ec3e632a 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -480,7 +480,6 @@ struct _ImageInfo
 };
 
 extern MagickExport const char
-  DefaultTileFrame[],
   DefaultTileGeometry[],
   DefaultTileLabel[],
   LoadImageTag[],

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 7dc947f744c7f1c48628365dc405a3f387eb5a07..36e3c7190f6a15fc1960229caaa15c40b8b97369 100644 (file)
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -43,6 +43,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
+#include "MagickCore/configure-private.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 20c91db7da2baac423e30f28fa1f8c06df0e9feb..dea9b8d02eeb939f370e796fad1720aba701ecf6 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -43,6 +43,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
+#include "MagickCore/configure-private.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 2726a74e3fde3f0f6dab78f556afb7ba2dc5a8c6..60334d7b94cf6fee05d1743764d535c4bcdb04ab 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,7 +12,9 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -78,7 +80,9 @@
 #endif
 
 /* Define if you have FFTW library */
-/* #undef FFTW_DELEGATE */
+#ifndef MAGICKCORE_FFTW_DELEGATE
+#define MAGICKCORE_FFTW_DELEGATE 1
+#endif
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -432,15 +436,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1163,7 +1167,9 @@
 #endif
 
 /* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1192,7 +1198,9 @@
 #endif
 
 /* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1204,7 +1212,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/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"
+#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"
 #endif
 
 /* The archive extension */
@@ -1255,7 +1263,9 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
 
 /* Define to the address where bug reports for this package should be sent. */
 #ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1310,7 +1320,9 @@
 #endif
 
 /* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1447,7 +1459,9 @@
 
 
 /* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1456,7 +1470,9 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-/* #undef WMF_DELEGATE */
+#ifndef MAGICKCORE_WMF_DELEGATE
+#define MAGICKCORE_WMF_DELEGATE 1
+#endif
 
 /* 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/mime.c b/MagickCore/mime.c
index d0e0e4584c89b737a4acc3caf9a6a7f1e52aec94..f0253452877765efe659e5e2fe5f1d262d8ef017 100644 (file)
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -41,6 +41,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
+#include "MagickCore/configure-private.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 747ce5214c76999f8e9d80bdb6f002191d78e134..237efac9013801a8905c874b426a7b09790fef89 100644 (file)
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -43,6 +43,7 @@
 #include "MagickCore/studio.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
+#include "MagickCore/configure-private.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/memory_.h"

diff --git a/MagickCore/string-private.h b/MagickCore/string-private.h
index 8d6d47b396089b4e3341fe8f6879513c9128e071..b495ef55e044750240a6209cdd8af86e68a03a21 100644 (file)
--- a/MagickCore/string-private.h
+++ b/MagickCore/string-private.h
@@ -28,6 +28,9 @@ extern MagickPrivate char
 extern MagickPrivate ssize_t
   FormatMagickSize(const MagickSizeType,const MagickBooleanType,char *);
 
+extern MagickPrivate StringInfo
+  *ConfigureFileToStringInfo(const char *);
+
 static inline double SiPrefixToDouble(const char *string,const double interval)
 {
   char

diff --git a/MagickCore/string.c b/MagickCore/string.c
index 3d16cbe7e2e4c33d378a0c95315f658db5a07895..4bf2925cd8aabe5e4d4a92b2e3f9cfc0898063a1 100644 (file)
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -563,7 +563,7 @@ MagickExport void ConcatenateStringInfo(StringInfo *string_info,
 %    o filename: the filename.
 %
 */
-MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
+MagickPrivate StringInfo *ConfigureFileToStringInfo(const char *filename)
 {
   char
     *string;

diff --git a/MagickCore/string_.h b/MagickCore/string_.h
index 0a8ca3492ab370b60c5940a5589f1f9daf42f7ed..03b67d49f8cc1e6786ef6d337966707d6cb63800 100644 (file)
--- a/MagickCore/string_.h
+++ b/MagickCore/string_.h
@@ -79,7 +79,6 @@ extern MagickExport StringInfo
   *AcquireStringInfo(const size_t),
   *BlobToStringInfo(const void *,const size_t),
   *CloneStringInfo(const StringInfo *),
-  *ConfigureFileToStringInfo(const char *),
   *DestroyStringInfo(StringInfo *),
   *FileToStringInfo(const char *,const size_t,ExceptionInfo *),
   *SplitStringInfo(StringInfo *,const size_t),

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 23d4b580deb37216a8262a079cb8edcfcd2b1d6d..abf9d43d69c03db64d62122bdc94067917de7127 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5157"
+#define MagickSVNRevision  "exported"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  5,0,0