From: cristy Date: Tue, 13 Sep 2011 13:59:17 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7009 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e3607c9c0c188210d6f8fc40c2d742df565b9ad;p=imagemagick --- diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index caa2cc762..bfb4b5d8c 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -1466,7 +1466,7 @@ static MagickBooleanType LoadDelegateList(const char *xml,const char *filename, static MagickBooleanType LoadDelegateLists(const char *filename, ExceptionInfo *exception) { -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) return(LoadDelegateList(DelegateMap,"built-in",0,exception)); #else const StringInfo diff --git a/MagickCore/locale.c b/MagickCore/locale.c index 174f5c500..046048150 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -1318,7 +1318,7 @@ static MagickBooleanType LoadLocaleList(const char *xml,const char *filename, static MagickBooleanType LoadLocaleLists(const char *filename, const char *locale,ExceptionInfo *exception) { -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) return(LoadLocaleList(LocaleMap,"built-in",locale,0,exception)); #else const StringInfo diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 2726a74e3..df4049a78 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -66,9 +66,6 @@ /* Define if you have Display Postscript */ /* #undef DPS_DELEGATE */ -/* Build self-contained, embeddable, zero-configuration ImageMagick */ -/* #undef EMBEDDABLE_SUPPORT */ - /* exclude deprecated methods in MagickCore API */ /* #undef EXCLUDE_DEPRECATED */ @@ -1488,6 +1485,9 @@ /* Define to 1 if the X Window System is missing or not being used. */ /* #undef X_DISPLAY_MISSING */ +/* Build self-contained, embeddable, zero-configuration ImageMagick */ +/* #undef ZERO_CONFIGURATION_SUPPORT */ + /* Define if you have zlib compression library */ #ifndef MAGICKCORE_ZLIB_DELEGATE #define MAGICKCORE_ZLIB_DELEGATE 1 diff --git a/MagickCore/memory.c b/MagickCore/memory.c index 9762682ab..0590f8ba9 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -44,7 +44,7 @@ % written by Yoo C. Chung. % % By default, ANSI memory methods are called (e.g. malloc). Use the -% custom memory allocator by defining MAGICKCORE_EMBEDDABLE_SUPPORT +% custom memory allocator by defining MAGICKCORE_ZERO_CONFIGURATION_SUPPORT % to allocate memory with private anonymous mapping rather than from the % heap. % @@ -144,7 +144,7 @@ static MagickMemoryMethods (DestroyMemoryHandler) free }; -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) static MemoryInfo memory_info; @@ -217,7 +217,7 @@ MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum) return(malloc(MagickMax(size,AlignedSize))); } -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -394,7 +394,7 @@ MagickExport void *AcquireMagickMemory(const size_t size) register void *memory; -#if !defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) memory=memory_methods.acquire_memory_handler(size == 0 ? 1UL : size); #else if (memory_semaphore == (SemaphoreInfo *) NULL) @@ -553,7 +553,7 @@ MagickExport void *CopyMagickMemory(void *destination,const void *source, */ MagickExport void DestroyMagickMemory(void) { -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) register ssize_t i; @@ -574,7 +574,7 @@ MagickExport void DestroyMagickMemory(void) #endif } -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -750,7 +750,7 @@ MagickExport void *RelinquishMagickMemory(void *memory) { if (memory == (void *) NULL) return((void *) NULL); -#if !defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) memory_methods.destroy_memory_handler(memory); #else assert((SizeOfBlock(memory) % (4*sizeof(size_t))) == 0); @@ -851,7 +851,7 @@ MagickExport void *ResetMagickMemory(void *memory,int byte,const size_t size) % */ -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) static inline void *ResizeBlock(void *block,size_t size) { register void @@ -878,7 +878,7 @@ MagickExport void *ResizeMagickMemory(void *memory,const size_t size) if (memory == (void *) NULL) return(AcquireMagickMemory(size)); -#if !defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) block=memory_methods.resize_memory_handler(memory,size == 0 ? 1UL : size); if (block == (void *) NULL) memory=RelinquishMagickMemory(memory); diff --git a/MagickCore/mime.c b/MagickCore/mime.c index f02534528..cf8195487 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -957,7 +957,7 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename, MagickExport MagickBooleanType LoadMimeLists(const char *filename, ExceptionInfo *exception) { -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) return(LoadMimeList(MimeMap,"built-in",0,exception)); #else const StringInfo diff --git a/MagickCore/type.c b/MagickCore/type.c index 62e3ce471..3e1cdcf20 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -1279,7 +1279,7 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename, static MagickBooleanType LoadTypeLists(const char *filename, ExceptionInfo *exception) { -#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT) +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) return(LoadTypeList(TypeMap,"built-in",0,exception)); #else char diff --git a/MagickCore/version.h b/MagickCore/version.h index 4a791709c..51d6bdb90 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 "5245" +#define MagickSVNRevision "5290" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 @@ -52,7 +52,12 @@ extern "C" { #else #define MagickHDRIFeature " " #endif -#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) +#define MagickZeroConfigurationFeature "Zero Configuration " +#else +#define MagickZeroConfigurationFeature " " +#endif +#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature MagickZeroConfigurationFeature #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7.0.0//index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/MagickCore/version.h.in b/MagickCore/version.h.in index 380266e5d..203db8661 100644 --- a/MagickCore/version.h.in +++ b/MagickCore/version.h.in @@ -52,7 +52,12 @@ extern "C" { #else #define MagickHDRIFeature " " #endif -#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature +#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT) +#define MagickZeroConfigurationFeature "Zero Configuration " +#else +#define MagickZeroConfigurationFeature " " +#endif +#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature MagickZeroConfigurationFeature #define MagickHomeURL "file://@DOCUMENTATION_PATH@/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/config/config.h.in b/config/config.h.in index 91ca1ce9f..9d5681d85 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -43,9 +43,6 @@ /* Define if you have Display Postscript */ #undef DPS_DELEGATE -/* Build self-contained, embeddable, zero-configuration ImageMagick */ -#undef EMBEDDABLE_SUPPORT - /* exclude deprecated methods in MagickCore API */ #undef EXCLUDE_DEPRECATED @@ -997,6 +994,9 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING +/* Build self-contained, embeddable, zero-configuration ImageMagick */ +#undef ZERO_CONFIGURATION_SUPPORT + /* Define if you have zlib compression library */ #undef ZLIB_DELEGATE diff --git a/config/configure.xml b/config/configure.xml index bf95bee44..53a4c44f2 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,7 +10,7 @@ - + diff --git a/configure b/configure index fdc482f84..cef8656f6 100755 --- a/configure +++ b/configure @@ -1096,7 +1096,7 @@ enable_delegate_build enable_deprecated enable_installed enable_cipher -enable_embeddable +enable_zero_configuration enable_hdri enable_assert enable_maintainer_mode @@ -1821,7 +1821,8 @@ Optional Features: MagickWand API's --disable-installed Formally install ImageMagick under PREFIX --disable-cipher disable enciphering and deciphering image pixels - --enable-embeddable enable self-contained, embeddable, + --enable-zero-configuration + enable self-contained, embeddable, zero-configuration ImageMagick --enable-hdri accurately represent the wide range of intensity levels found in real scenes @@ -3583,7 +3584,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=5245 +MAGICK_SVN_REVISION=5290 @@ -9278,7 +9279,7 @@ CFLAGS="$CL_CFLAGS $CFLAGS" LIBS="$CL_LIBS $LIBS" if test "$enable_opencl" != no; then - if test "_OPENCL" = '1'; then + if test "X$ax_cv_check_cl_libcl" != Xno; then : MAGICK_FEATURES="OpenCL $MAGICK_FEATURES" fi fi @@ -21040,19 +21041,20 @@ $as_echo "#define CIPHER_SUPPORT 1" >>confdefs.h fi -# Build an embeddable version of ImageMagick. -# Check whether --enable-embeddable was given. -if test "${enable_embeddable+set}" = set; then : - enableval=$enable_embeddable; enable_embeddable=$enableval +# Build a zero-configuration version of ImageMagick. +# Check whether --enable-zero-configuration was given. +if test "${enable_zero_configuration+set}" = set; then : + enableval=$enable_zero_configuration; enable_zero_configuration=$enableval else - enable_embeddable='no' + enable_zero_configuration='no' fi -if test "$enable_embeddable" = 'yes'; then +if test "$enable_zero_configuration" = 'yes'; then -$as_echo "#define EMBEDDABLE_SUPPORT 1" >>confdefs.h +$as_echo "#define ZERO_CONFIGURATION_SUPPORT 1" >>confdefs.h + MAGICK_FEATURES="Zero Configuration $MAGICK_FEATURES" fi # Build a high dynamic range version of ImageMagick. diff --git a/configure.ac b/configure.ac index 2e9f36f29..579505011 100755 --- a/configure.ac +++ b/configure.ac @@ -562,15 +562,16 @@ if test "$enable_cipher" = 'yes'; then AC_DEFINE(CIPHER_SUPPORT,1,[permit enciphering and deciphering image pixels]) fi -# Build an embeddable version of ImageMagick. -AC_ARG_ENABLE([embeddable], - [AC_HELP_STRING([--enable-embeddable], +# Build a zero-configuration version of ImageMagick. +AC_ARG_ENABLE([zero-configuration], + [AC_HELP_STRING([--enable-zero-configuration], [enable self-contained, embeddable, zero-configuration ImageMagick])], - [enable_embeddable=$enableval], - [enable_embeddable='no']) + [enable_zero_configuration=$enableval], + [enable_zero_configuration='no']) -if test "$enable_embeddable" = 'yes'; then - AC_DEFINE(EMBEDDABLE_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick]) +if test "$enable_zero_configuration" = 'yes'; then + AC_DEFINE(ZERO_CONFIGURATION_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick]) + MAGICK_FEATURES="Zero Configuration $MAGICK_FEATURES" fi # Build a high dynamic range version of ImageMagick.