From 0a4d92f06aff8fa275dafec6a83e25d4f47bba1f Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 31 Aug 2011 19:25:00 +0000 Subject: [PATCH] --- MagickCore/MagickCore.h | 1 + MagickCore/Makefile.am | 2 ++ MagickCore/magick-config.h | 22 ++++++---------------- MagickCore/magick.c | 1 + MagickCore/nt-base.c | 1 + MagickCore/resource-private.h | 32 ++++++++++++++++++++++++++++++++ MagickCore/resource.c | 3 ++- MagickCore/resource_.h | 1 - MagickCore/studio.h | 2 +- MagickCore/version.h | 2 +- MagickWand/MagickWand.h | 1 + MagickWand/studio.h | 1 + Makefile.in | 15 ++++++++------- coders/fpx.c | 1 + coders/xtrn.c | 24 +++++++++++------------- config/config.h.in | 5 +---- config/configure.xml | 4 ++-- configure | 2 +- 18 files changed, 73 insertions(+), 47 deletions(-) create mode 100644 MagickCore/resource-private.h diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index 3fabf6925..873148ebe 100644 --- 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 e4b326cfd..6ca66e540 100644 --- 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 efe979e75..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 @@ -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 cff452b1a..e582b0158 100644 --- 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 594f4eb30..82cad0a8a 100644 --- 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 index 000000000..be042c344 --- /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 1fc7c484b..220aeda03 100644 --- 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 7fd86e1a6..108089d93 100644 --- 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 9751bfc1d..9de052712 100644 --- 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 643870c9b..72648d67f 100644 --- 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 c079e72df..407acd68b 100644 --- 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 388c077cf..9c04ba469 100644 --- 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 7fa729e37..3d8ea656a 100644 --- 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 67c950c20..289f5504e 100644 --- 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 672c77c36..4fbb2b24e 100644 --- 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); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -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 7e631619e..91ca1ce9f 100644 --- 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 bc93bd700..11c7c7d33 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 099c1644f..7d8cf625e 100755 --- 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 -- 2.40.0