(no commit message)

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index 3fabf692539c5c4d7b1b71a4d944f7536acef27a..873148ebe99fd9cd17d69f53051fa98da52b440c 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -56,6 +56,7 @@ extern "C" {
 #endif 
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+# define MagickPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
 #  define _MAGICKDLL_
 # endif

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index e4b326cfd2dc8175dce4967a5fe34a8002b96029..6ca66e540a555ca118ba3b17ed106213dbd9abe9 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -211,6 +211,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/resize-private.h \
        MagickCore/resource.c \
        MagickCore/resource_.h \
+       MagickCore/resource-private.h \
        MagickCore/segment.c \
        MagickCore/segment.h \
        MagickCore/semaphore.c \
@@ -391,6 +392,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/random-private.h \
        MagickCore/resample-private.h \
        MagickCore/resize-private.h \
+       MagickCore/resource-private.h \
        MagickCore/semaphore-private.h \
        MagickCore/signature-private.h \
        MagickCore/static.h \

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index efe979e75ca7136759a424b1ae1174f741e4cb93..2726a74e3fde3f0f6dab78f556afb7ba2dc5a8c6 100644 (file)
--- 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
@@ -1208,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/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/octave/3.4.2:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/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/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 */
@@ -1259,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
@@ -1316,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
@@ -1464,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/magick.c b/MagickCore/magick.c
index cff452b1ad192999b1525f1368eaeda4bb41f4ad..e582b01582af4406d606d3191b52c5234a3ea6ee 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -67,6 +67,7 @@
 #include "MagickCore/random_.h"
 #include "MagickCore/registry.h"
 #include "MagickCore/resource_.h"
+#include "MagickCore/resource-private.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/semaphore-private.h"

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 594f4eb30cf42bb564e9388b741e47c359429023..82cad0a8a81cb73a6d58cf993a8b236c1dff1330 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -47,6 +47,7 @@
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/resource_.h"
+#include "MagickCore/resource-private.h"
 #include "MagickCore/timer.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/utility.h"

diff --git a/MagickCore/resource-private.h b/MagickCore/resource-private.h
new file mode 100644 (file)
index 0000000..be042c3
--- /dev/null
+++ b/MagickCore/resource-private.h
@@ -0,0 +1,32 @@
+/*
+  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore private resource methods.
+*/
+#ifndef _MAGICKCORE_RESOURCE_PRIVATE_H
+#define _MAGICKCORE_RESOURCE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate void
+  AsynchronousResourceComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 1fc7c484bd0c78a7d7667f2a3ed26c27eba914a3..220aeda03c381bcd706df8d48f7cafb54862b167 100644 (file)
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -53,6 +53,7 @@
 #include "MagickCore/random_.h"
 #include "MagickCore/registry.h"
 #include "MagickCore/resource_.h"
+#include "MagickCore/resource-private.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/signature-private.h"
 #include "MagickCore/string_.h"
@@ -285,7 +286,7 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
 %      ResourceComponentTerminus(void)
 %
 */
-MagickExport void AsynchronousResourceComponentTerminus(void)
+MagickPrivate void AsynchronousResourceComponentTerminus(void)
 {
   const char
     *path;

diff --git a/MagickCore/resource_.h b/MagickCore/resource_.h
index 7fd86e1a64a4f54d67aea593ebea5a93c873f6c9..108089d93a56ca82d70bda28380dbfaa79a6fd70 100644 (file)
--- a/MagickCore/resource_.h
+++ b/MagickCore/resource_.h
@@ -52,7 +52,6 @@ extern MagickExport MagickSizeType
   GetMagickResourceLimit(const ResourceType);
 
 extern MagickExport void
-  AsynchronousResourceComponentTerminus(void),
   RelinquishMagickResource(const ResourceType,const MagickSizeType),
   ResourceComponentTerminus(void);
 

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 9751bfc1d8e3e19f4fd1feaf223dfd322e11ccdd..9de05271258605cb17dc66c4080dd9fdbda26450 100644 (file)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -71,6 +71,7 @@ extern "C" {
 #endif
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+# define MagickPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_
 # endif
@@ -130,7 +131,6 @@ extern "C" {
 #  pragma warning(disable : 4786)
 #  pragma warning(disable : 4996)
 # endif
-# define MagickPrivate
 #else
 # if __GNUC__ >= 4
 #  define MagickExport __attribute__ ((visibility ("default")))

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 643870c9b886aefdbec9ab506a64e47e86fa5a73..72648d67fb30be05de0a8e3501e0b5163733849d 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  "exported"
+#define MagickSVNRevision  "5077"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  5,0,0

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index c079e72df237e7bb58553121476e413120929d76..407acd68b42f67fff8e947b33f91b3164905ab51 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -56,6 +56,7 @@ extern "C" {
 #endif 
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+# define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_
 # endif

diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 388c077cfadcbb0e7fe0540c66592b23c60984de..9c04ba4694a48f05a40e0a2fdfaa6c077d2877f0 100644 (file)
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -65,6 +65,7 @@ extern "C" {
 #endif
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+# define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_
 # endif

diff --git a/Makefile.in b/Makefile.in
index 7fa729e37cdcea0494c7d59fcbd1b0eb5f0a09d2..3d8ea656ae29c1a234666b82396b713410689ec8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -444,10 +444,11 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/resample.h MagickCore/resample-private.h \
        MagickCore/resize.c MagickCore/resize.h \
        MagickCore/resize-private.h MagickCore/resource.c \
-       MagickCore/resource_.h MagickCore/segment.c \
-       MagickCore/segment.h MagickCore/semaphore.c \
-       MagickCore/semaphore.h MagickCore/semaphore-private.h \
-       MagickCore/shear.c MagickCore/shear.h MagickCore/signature.c \
+       MagickCore/resource_.h MagickCore/resource-private.h \
+       MagickCore/segment.c MagickCore/segment.h \
+       MagickCore/semaphore.c MagickCore/semaphore.h \
+       MagickCore/semaphore-private.h MagickCore/shear.c \
+       MagickCore/shear.h MagickCore/signature.c \
        MagickCore/signature.h MagickCore/signature-private.h \
        MagickCore/splay-tree.c MagickCore/splay-tree.h \
        MagickCore/static.c MagickCore/static.h MagickCore/statistic.c \
@@ -1585,8 +1586,7 @@ coders_webp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WEBP_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_webp_la_rpath =  \
 @WEBP_DELEGATE_TRUE@@WITH_MODULES_TRUE@        -rpath $(codersdir)
 coders_wmf_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_coders_wmf_la_OBJECTS = coders/coders_wmf_la-wmf.lo
 coders_wmf_la_OBJECTS = $(am_coders_wmf_la_OBJECTS)
 coders_wmf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -2554,7 +2554,6 @@ VERSION = @VERSION@
 WEBP_LIBS = @WEBP_LIBS@
 WMFDecodeDelegate = @WMFDecodeDelegate@
 WMF_LIBS = @WMF_LIBS@
-WMF_LIBS_DEPS = @WMF_LIBS_DEPS@
 WWWDecodeDelegate = @WWWDecodeDelegate@
 WinPathScript = @WinPathScript@
 X11_LIBS = @X11_LIBS@
@@ -4018,6 +4017,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/resize-private.h \
        MagickCore/resource.c \
        MagickCore/resource_.h \
+       MagickCore/resource-private.h \
        MagickCore/segment.c \
        MagickCore/segment.h \
        MagickCore/semaphore.c \
@@ -4193,6 +4193,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/random-private.h \
        MagickCore/resample-private.h \
        MagickCore/resize-private.h \
+       MagickCore/resource-private.h \
        MagickCore/semaphore-private.h \
        MagickCore/signature-private.h \
        MagickCore/static.h \

diff --git a/coders/fpx.c b/coders/fpx.c
index 67c950c2088e1002b4e577b3eded08022b19dd5c..289f5504e84db2824916bbc8e42e1e80c19902f3 100644 (file)
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -39,6 +39,7 @@
 /*
   Include declarations.
 */
+#include "MagickCore/studio.h"
 #include "MagickCore/attribute.h"
 #include "MagickCore/property.h"
 #include "MagickCore/blob.h"

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 672c77c36ac3fcf9fd59f03574a207ec328268f6..4fbb2b24e0253162475f8f23e2087c24461d53f7 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -79,7 +79,7 @@
   Forward declarations.
 */
 static MagickBooleanType
-  WriteXTRNImage(const ImageInfo *,Image *);
+  WriteXTRNImage(const ImageInfo *,Image *,ExceptionInfo *exception);
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -422,7 +422,8 @@ ModuleExport void UnregisterXTRNImage(void)
 %
 %  The format of the WriteXTRNImage method is:
 %
-%      MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image)
+%      MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
+%        Image *image,ExceptionInfo *exception)
 %
 %  A description of each parameter follows.
 %
@@ -430,6 +431,7 @@ ModuleExport void UnregisterXTRNImage(void)
 %
 %    o image:  A pointer to a Image structure.
 %
+%    o exception: return any errors or warnings in this structure.
 %
 */
 
@@ -475,7 +477,7 @@ size_t SafeArrayFifo(const Image *image,const void *data,const size_t length)
   return(tlen);
 }
 
-static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image,ExceptionInfo *exception)
 {
   Image *
     p;
@@ -498,7 +500,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
   if (LocaleCompare(image_info->magick,"XTRNFILE") == 0)
     {
       clone_info=CloneImageInfo(image_info);
-      status=WriteImage(image_info,image);
+      status=WriteImage(image_info,image,exception);
       if (status == MagickFalse)
         CatchImageException(image);
       clone_info=DestroyImageInfo(clone_info);
@@ -520,7 +522,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
           if ((image_info_ptr != (ImageInfo **) NULL) &&
               (image_ptr != (Image **) NULL))
             {
-              *image_ptr=CloneImage(image,0,0,MagickFalse,&(image->exception));
+              *image_ptr=CloneImage(image,0,0,MagickFalse,exception);
               *image_info_ptr=clone_info;
             }
         }
@@ -530,9 +532,6 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
       char
         **blob_data;
 
-      ExceptionInfo
-        exception;
-
       size_t
         *blob_length;
 
@@ -555,14 +554,13 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
             (void) CopyMagickString(p->filename,filename,MaxTextExtent);
             p->scene=scene++;
           }
-          SetImageInfo(clone_info,1,&image->exception);
+          SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
-          GetExceptionInfo(&exception);
           if (*blob_length == 0)
             *blob_length=8192;
           *blob_data=(char *) ImageToBlob(clone_info,image,blob_length,
-            &exception);
+            exception);
           if (*blob_data == NULL)
             status=MagickFalse;
           if (status == MagickFalse)
@@ -594,7 +592,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
             (void) CopyMagickString(p->filename,filename,MaxTextExtent);
             p->scene=scene++;
           }
-          SetImageInfo(clone_info,1,&image->exception);
+          SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
           status=WriteStream(clone_info,image,fifo);
@@ -623,7 +621,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
             (void) CopyMagickString(p->filename,filename,MaxTextExtent);
             p->scene=scene++;
           }
-          SetImageInfo(clone_info,1,&image->exception);
+          SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
           status=WriteStream(clone_info,image,SafeArrayFifo);

diff --git a/config/config.h.in b/config/config.h.in
index 7e631619ee99a7e37661cd6bdd25e77bdd2eacaf..91ca1ce9faf4dbf854cbc8955ebe8812f41e67c9 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -760,9 +760,6 @@
 /* Define if you have umem memory allocation library */
 #undef HasUMEM
 
-/* Define if you have wmflite library */
-#undef HasWMFlite
-
 /* ImageMagick is formally installed under prefix */
 #undef INSTALLED_SUPPORT
 
@@ -973,7 +970,7 @@
 /* Define if using the dmalloc debugging malloc package */
 #undef WITH_DMALLOC
 
-/* Define if you have wmf library */
+/* Define if you have WMF library */
 #undef WMF_DELEGATE
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most

diff --git a/config/configure.xml b/config/configure.xml
index bc93bd700fb8083e6bfd6567a3c56d55eec457d9..11c7c7d338a7d069e1d353298acb06bb22cd4ca2 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5051" />
-  <configure name="RELEASE_DATE" value="2011-08-24"/>
+  <configure name="SVN_REVISION" value="5077" />
+  <configure name="RELEASE_DATE" value="2011-08-31"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 099c1644f90110ff241eab114ffbe24bb22c8014..7d8cf625ea8c8876fb5668ee157879a25771e897 100755 (executable)
--- a/configure
+++ b/configure
@@ -3583,7 +3583,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=5051
+MAGICK_SVN_REVISION=5077