From: cristy Date: Tue, 22 Apr 2014 12:39:00 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2427 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e83bf05ce70f41f26a5551b540ddae0a04fb8ed;p=imagemagick --- diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 96f9cb9fa..bbde8db36 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -15,13 +15,17 @@ /* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ -/* #undef BZLIB_DELEGATE */ +#ifndef MAGICKCORE_BZLIB_DELEGATE +#define MAGICKCORE_BZLIB_DELEGATE 1 +#endif /* Define if you have CAIRO library */ /* #undef CAIRO_DELEGATE */ /* permit enciphering and deciphering image pixels */ -/* #undef CIPHER_SUPPORT */ +#ifndef MAGICKCORE_CIPHER_SUPPORT +#define MAGICKCORE_CIPHER_SUPPORT 1 +#endif /* Define to 1 if the `closedir' function returns void instead of `int'. */ /* #undef CLOSEDIR_VOID */ @@ -43,7 +47,9 @@ #endif /* Define if you have DJVU library */ -/* #undef DJVU_DELEGATE */ +#ifndef MAGICKCORE_DJVU_DELEGATE +#define MAGICKCORE_DJVU_DELEGATE 1 +#endif /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH @@ -62,7 +68,9 @@ #endif /* Define if you have FFTW library */ -/* #undef FFTW_DELEGATE */ +#ifndef MAGICKCORE_FFTW_DELEGATE +#define MAGICKCORE_FFTW_DELEGATE 1 +#endif /* filter subdirectory. */ #ifndef MAGICKCORE_FILTER_DIRNAME @@ -70,13 +78,19 @@ #endif /* Define if you have FONTCONFIG library */ -/* #undef FONTCONFIG_DELEGATE */ +#ifndef MAGICKCORE_FONTCONFIG_DELEGATE +#define MAGICKCORE_FONTCONFIG_DELEGATE 1 +#endif /* Define if you have FlashPIX library */ -/* #undef FPX_DELEGATE */ +#ifndef MAGICKCORE_FPX_DELEGATE +#define MAGICKCORE_FPX_DELEGATE 1 +#endif /* Define if you have FREETYPE library */ -/* #undef FREETYPE_DELEGATE */ +#ifndef MAGICKCORE_FREETYPE_DELEGATE +#define MAGICKCORE_FREETYPE_DELEGATE 1 +#endif /* Define if you have Ghostscript library or framework */ /* #undef GS_DELEGATE */ @@ -85,74 +99,114 @@ /* #undef GVC_DELEGATE */ /* Define to 1 if you have the `acosh' function. */ -/* #undef HAVE_ACOSH */ +#ifndef MAGICKCORE_HAVE_ACOSH +#define MAGICKCORE_HAVE_ACOSH 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_ARM_LIMITS_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_ARPA_INET_H */ +#ifndef MAGICKCORE_HAVE_ARPA_INET_H +#define MAGICKCORE_HAVE_ARPA_INET_H 1 +#endif /* Define to 1 if you have the `asinh' function. */ -/* #undef HAVE_ASINH */ +#ifndef MAGICKCORE_HAVE_ASINH +#define MAGICKCORE_HAVE_ASINH 1 +#endif /* Define to 1 if you have the `atanh' function. */ -/* #undef HAVE_ATANH */ +#ifndef MAGICKCORE_HAVE_ATANH +#define MAGICKCORE_HAVE_ATANH 1 +#endif /* Define to 1 if you have the `atexit' function. */ -/* #undef HAVE_ATEXIT */ +#ifndef MAGICKCORE_HAVE_ATEXIT +#define MAGICKCORE_HAVE_ATEXIT 1 +#endif /* Define to 1 if you have the `atoll' function. */ -/* #undef HAVE_ATOLL */ +#ifndef MAGICKCORE_HAVE_ATOLL +#define MAGICKCORE_HAVE_ATOLL 1 +#endif /* define if bool is a built-in type */ -/* #undef HAVE_BOOL */ +#ifndef MAGICKCORE_HAVE_BOOL +#define MAGICKCORE_HAVE_BOOL /**/ +#endif /* Define to 1 if you have the `cabs' function. */ -/* #undef HAVE_CABS */ +#ifndef MAGICKCORE_HAVE_CABS +#define MAGICKCORE_HAVE_CABS 1 +#endif /* Define to 1 if you have the `carg' function. */ -/* #undef HAVE_CARG */ +#ifndef MAGICKCORE_HAVE_CARG +#define MAGICKCORE_HAVE_CARG 1 +#endif /* Define to 1 if you have the `cimag' function. */ -/* #undef HAVE_CIMAG */ +#ifndef MAGICKCORE_HAVE_CIMAG +#define MAGICKCORE_HAVE_CIMAG 1 +#endif /* Define to 1 if you have the `clock' function. */ -/* #undef HAVE_CLOCK */ +#ifndef MAGICKCORE_HAVE_CLOCK +#define MAGICKCORE_HAVE_CLOCK 1 +#endif /* Define to 1 if you have clock_gettime. */ -/* #undef HAVE_CLOCK_GETTIME */ +#ifndef MAGICKCORE_HAVE_CLOCK_GETTIME +#define MAGICKCORE_HAVE_CLOCK_GETTIME 1 +#endif /* Define to 1 if clock_gettime supports CLOCK_REALTIME. */ -/* #undef HAVE_CLOCK_REALTIME */ +#ifndef MAGICKCORE_HAVE_CLOCK_REALTIME +#define MAGICKCORE_HAVE_CLOCK_REALTIME 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_CL_CL_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_COMPLEX_H */ +#ifndef MAGICKCORE_HAVE_COMPLEX_H +#define MAGICKCORE_HAVE_COMPLEX_H 1 +#endif /* Define to 1 if you have the `creal' function. */ -/* #undef HAVE_CREAL */ +#ifndef MAGICKCORE_HAVE_CREAL +#define MAGICKCORE_HAVE_CREAL 1 +#endif /* Define to 1 if you have the `ctime_r' function. */ -/* #undef HAVE_CTIME_R */ +#ifndef MAGICKCORE_HAVE_CTIME_R +#define MAGICKCORE_HAVE_CTIME_R 1 +#endif /* Define to 1 if you have the declaration of `pread', and to 0 if you don't. */ -/* #undef HAVE_DECL_PREAD */ +#ifndef MAGICKCORE_HAVE_DECL_PREAD +#define MAGICKCORE_HAVE_DECL_PREAD 1 +#endif /* Define to 1 if you have the declaration of `pwrite', and to 0 if you don't. */ -/* #undef HAVE_DECL_PWRITE */ +#ifndef MAGICKCORE_HAVE_DECL_PWRITE +#define MAGICKCORE_HAVE_DECL_PWRITE 1 +#endif /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you don't. */ -/* #undef HAVE_DECL_STRERROR_R */ +#ifndef MAGICKCORE_HAVE_DECL_STRERROR_R +#define MAGICKCORE_HAVE_DECL_STRERROR_R 1 +#endif /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you don't. */ -/* #undef HAVE_DECL_STRLCPY */ +#ifndef MAGICKCORE_HAVE_DECL_STRLCPY +#define MAGICKCORE_HAVE_DECL_STRLCPY 0 +#endif /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. */ @@ -160,107 +214,167 @@ /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you don't. */ -/* #undef HAVE_DECL_VSNPRINTF */ +#ifndef MAGICKCORE_HAVE_DECL_VSNPRINTF +#define MAGICKCORE_HAVE_DECL_VSNPRINTF 1 +#endif /* Define to 1 if you have the `directio' function. */ /* #undef HAVE_DIRECTIO */ /* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_DIRENT_H */ +#ifndef MAGICKCORE_HAVE_DIRENT_H +#define MAGICKCORE_HAVE_DIRENT_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#ifndef MAGICKCORE_HAVE_DLFCN_H +#define MAGICKCORE_HAVE_DLFCN_H 1 +#endif /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* #undef HAVE_DOPRNT */ /* Define to 1 if the system has the type `double_t'. */ -/* #undef HAVE_DOUBLE_T */ +#ifndef MAGICKCORE_HAVE_DOUBLE_T +#define MAGICKCORE_HAVE_DOUBLE_T 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_ERRNO_H */ +#ifndef MAGICKCORE_HAVE_ERRNO_H +#define MAGICKCORE_HAVE_ERRNO_H 1 +#endif /* Define to 1 if you have the `execvp' function. */ -/* #undef HAVE_EXECVP */ +#ifndef MAGICKCORE_HAVE_EXECVP +#define MAGICKCORE_HAVE_EXECVP 1 +#endif /* Define to 1 if you have the `fchmod' function. */ -/* #undef HAVE_FCHMOD */ +#ifndef MAGICKCORE_HAVE_FCHMOD +#define MAGICKCORE_HAVE_FCHMOD 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_FCNTL_H */ +#ifndef MAGICKCORE_HAVE_FCNTL_H +#define MAGICKCORE_HAVE_FCNTL_H 1 +#endif /* Define to 1 if the system has the type `float_t'. */ -/* #undef HAVE_FLOAT_T */ +#ifndef MAGICKCORE_HAVE_FLOAT_T +#define MAGICKCORE_HAVE_FLOAT_T 1 +#endif /* Define to 1 if you have the `floor' function. */ -/* #undef HAVE_FLOOR */ +#ifndef MAGICKCORE_HAVE_FLOOR +#define MAGICKCORE_HAVE_FLOOR 1 +#endif /* Define to 1 if you have the `fork' function. */ -/* #undef HAVE_FORK */ +#ifndef MAGICKCORE_HAVE_FORK +#define MAGICKCORE_HAVE_FORK 1 +#endif /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -/* #undef HAVE_FSEEKO */ +#ifndef MAGICKCORE_HAVE_FSEEKO +#define MAGICKCORE_HAVE_FSEEKO 1 +#endif /* Define to 1 if you have the `ftime' function. */ -/* #undef HAVE_FTIME */ +#ifndef MAGICKCORE_HAVE_FTIME +#define MAGICKCORE_HAVE_FTIME 1 +#endif /* Define to 1 if you have the `ftruncate' function. */ -/* #undef HAVE_FTRUNCATE */ +#ifndef MAGICKCORE_HAVE_FTRUNCATE +#define MAGICKCORE_HAVE_FTRUNCATE 1 +#endif /* Define to 1 if you have the `getcwd' function. */ -/* #undef HAVE_GETCWD */ +#ifndef MAGICKCORE_HAVE_GETCWD +#define MAGICKCORE_HAVE_GETCWD 1 +#endif /* Define to 1 if you have the `getc_unlocked' function. */ -/* #undef HAVE_GETC_UNLOCKED */ +#ifndef MAGICKCORE_HAVE_GETC_UNLOCKED +#define MAGICKCORE_HAVE_GETC_UNLOCKED 1 +#endif /* Define to 1 if you have the `getdtablesize' function. */ -/* #undef HAVE_GETDTABLESIZE */ +#ifndef MAGICKCORE_HAVE_GETDTABLESIZE +#define MAGICKCORE_HAVE_GETDTABLESIZE 1 +#endif /* Define to 1 if you have the `getexecname' function. */ /* #undef HAVE_GETEXECNAME */ /* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ +#ifndef MAGICKCORE_HAVE_GETPAGESIZE +#define MAGICKCORE_HAVE_GETPAGESIZE 1 +#endif /* Define to 1 if you have the `getpid' function. */ -/* #undef HAVE_GETPID */ +#ifndef MAGICKCORE_HAVE_GETPID +#define MAGICKCORE_HAVE_GETPID 1 +#endif /* Define to 1 if you have the `getrlimit' function. */ -/* #undef HAVE_GETRLIMIT */ +#ifndef MAGICKCORE_HAVE_GETRLIMIT +#define MAGICKCORE_HAVE_GETRLIMIT 1 +#endif /* Define to 1 if you have the `getrusage' function. */ -/* #undef HAVE_GETRUSAGE */ +#ifndef MAGICKCORE_HAVE_GETRUSAGE +#define MAGICKCORE_HAVE_GETRUSAGE 1 +#endif /* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ +#ifndef MAGICKCORE_HAVE_GETTIMEOFDAY +#define MAGICKCORE_HAVE_GETTIMEOFDAY 1 +#endif /* Define to 1 if you have the `gmtime_r' function. */ -/* #undef HAVE_GMTIME_R */ +#ifndef MAGICKCORE_HAVE_GMTIME_R +#define MAGICKCORE_HAVE_GMTIME_R 1 +#endif /* Compile with hugepage support */ /* #undef HAVE_HUGEPAGES */ /* Define to 1 if the system has the type `intmax_t'. */ -/* #undef HAVE_INTMAX_T */ +#ifndef MAGICKCORE_HAVE_INTMAX_T +#define MAGICKCORE_HAVE_INTMAX_T 1 +#endif /* Define to 1 if the system has the type `intptr_t'. */ -/* #undef HAVE_INTPTR_T */ +#ifndef MAGICKCORE_HAVE_INTPTR_T +#define MAGICKCORE_HAVE_INTPTR_T 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ +#ifndef MAGICKCORE_HAVE_INTTYPES_H +#define MAGICKCORE_HAVE_INTTYPES_H 1 +#endif /* Define to 1 if you have the `isnan' function. */ -/* #undef HAVE_ISNAN */ +#ifndef MAGICKCORE_HAVE_ISNAN +#define MAGICKCORE_HAVE_ISNAN 1 +#endif /* Define to 1 if you have the `j0' function. */ -/* #undef HAVE_J0 */ +#ifndef MAGICKCORE_HAVE_J0 +#define MAGICKCORE_HAVE_J0 1 +#endif /* Define to 1 if you have the `j1' function. */ -/* #undef HAVE_J1 */ +#ifndef MAGICKCORE_HAVE_J1 +#define MAGICKCORE_HAVE_J1 1 +#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 */ @@ -275,32 +389,48 @@ /* #undef HAVE_LIBGCOV */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_LIMITS_H */ +#ifndef MAGICKCORE_HAVE_LIMITS_H +#define MAGICKCORE_HAVE_LIMITS_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_UNISTD_H */ +#ifndef MAGICKCORE_HAVE_LINUX_UNISTD_H +#define MAGICKCORE_HAVE_LINUX_UNISTD_H 1 +#endif /* Define to 1 if you have the `lltostr' function. */ /* #undef HAVE_LLTOSTR */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_LOCALE_H */ +#ifndef MAGICKCORE_HAVE_LOCALE_H +#define MAGICKCORE_HAVE_LOCALE_H 1 +#endif /* Define to 1 if you have the `localtime_r' function. */ -/* #undef HAVE_LOCALTIME_R */ +#ifndef MAGICKCORE_HAVE_LOCALTIME_R +#define MAGICKCORE_HAVE_LOCALTIME_R 1 +#endif /* Define to 1 if the system has the type `long double'. */ -/* #undef HAVE_LONG_DOUBLE */ +#ifndef MAGICKCORE_HAVE_LONG_DOUBLE +#define MAGICKCORE_HAVE_LONG_DOUBLE 1 +#endif /* Define to 1 if the type `long double' works and has more range or precision than `double'. */ -/* #undef HAVE_LONG_DOUBLE_WIDER */ +#ifndef MAGICKCORE_HAVE_LONG_DOUBLE_WIDER +#define MAGICKCORE_HAVE_LONG_DOUBLE_WIDER 1 +#endif /* Define to 1 if the system has the type 'long long int'. */ -/* #undef HAVE_LONG_LONG_INT */ +#ifndef MAGICKCORE_HAVE_LONG_LONG_INT +#define MAGICKCORE_HAVE_LONG_LONG_INT 1 +#endif /* Define to 1 if you have the `lstat' function. */ -/* #undef HAVE_LSTAT */ +#ifndef MAGICKCORE_HAVE_LSTAT +#define MAGICKCORE_HAVE_LSTAT 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_MACHINE_PARAM_H */ @@ -309,43 +439,67 @@ /* #undef HAVE_MACH_O_DYLD_H */ /* Define to 1 if declares mbstate_t. */ -/* #undef HAVE_MBSTATE_T */ +#ifndef MAGICKCORE_HAVE_MBSTATE_T +#define MAGICKCORE_HAVE_MBSTATE_T 1 +#endif /* Define to 1 if you have the `memmove' function. */ -/* #undef HAVE_MEMMOVE */ +#ifndef MAGICKCORE_HAVE_MEMMOVE +#define MAGICKCORE_HAVE_MEMMOVE 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_MEMORY_H */ +#ifndef MAGICKCORE_HAVE_MEMORY_H +#define MAGICKCORE_HAVE_MEMORY_H 1 +#endif /* Define to 1 if you have the `memset' function. */ -/* #undef HAVE_MEMSET */ +#ifndef MAGICKCORE_HAVE_MEMSET +#define MAGICKCORE_HAVE_MEMSET 1 +#endif /* Define to 1 if you have the `mkstemp' function. */ -/* #undef HAVE_MKSTEMP */ +#ifndef MAGICKCORE_HAVE_MKSTEMP +#define MAGICKCORE_HAVE_MKSTEMP 1 +#endif /* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ +#ifndef MAGICKCORE_HAVE_MMAP +#define MAGICKCORE_HAVE_MMAP 1 +#endif /* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ +#ifndef MAGICKCORE_HAVE_MUNMAP +#define MAGICKCORE_HAVE_MUNMAP 1 +#endif /* define if the compiler implements namespaces */ -/* #undef HAVE_NAMESPACES */ +#ifndef MAGICKCORE_HAVE_NAMESPACES +#define MAGICKCORE_HAVE_NAMESPACES /**/ +#endif /* Define if g++ supports namespace std. */ -/* #undef HAVE_NAMESPACE_STD */ +#ifndef MAGICKCORE_HAVE_NAMESPACE_STD +#define MAGICKCORE_HAVE_NAMESPACE_STD /**/ +#endif /* Define to 1 if you have the `nanosleep' function. */ -/* #undef HAVE_NANOSLEEP */ +#ifndef MAGICKCORE_HAVE_NANOSLEEP +#define MAGICKCORE_HAVE_NANOSLEEP 1 +#endif /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_NETINET_IN_H */ +#ifndef MAGICKCORE_HAVE_NETINET_IN_H +#define MAGICKCORE_HAVE_NETINET_IN_H 1 +#endif /* Define to 1 if you have the `newlocale' function. */ -/* #undef HAVE_NEWLOCALE */ +#ifndef MAGICKCORE_HAVE_NEWLOCALE +#define MAGICKCORE_HAVE_NEWLOCALE 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_OPENCL_CL_H */ @@ -354,34 +508,54 @@ /* #undef HAVE_OS_H */ /* Define to 1 if you have the `pclose' function. */ -/* #undef HAVE_PCLOSE */ +#ifndef MAGICKCORE_HAVE_PCLOSE +#define MAGICKCORE_HAVE_PCLOSE 1 +#endif /* Define to 1 if you have the `poll' function. */ -/* #undef HAVE_POLL */ +#ifndef MAGICKCORE_HAVE_POLL +#define MAGICKCORE_HAVE_POLL 1 +#endif /* Define to 1 if you have the `popen' function. */ -/* #undef HAVE_POPEN */ +#ifndef MAGICKCORE_HAVE_POPEN +#define MAGICKCORE_HAVE_POPEN 1 +#endif /* Define to 1 if you have the `posix_fadvise' function. */ -/* #undef HAVE_POSIX_FADVISE */ +#ifndef MAGICKCORE_HAVE_POSIX_FADVISE +#define MAGICKCORE_HAVE_POSIX_FADVISE 1 +#endif /* Define to 1 if you have the `posix_fallocate' function. */ -/* #undef HAVE_POSIX_FALLOCATE */ +#ifndef MAGICKCORE_HAVE_POSIX_FALLOCATE +#define MAGICKCORE_HAVE_POSIX_FALLOCATE 1 +#endif /* Define to 1 if you have the `posix_madvise' function. */ -/* #undef HAVE_POSIX_MADVISE */ +#ifndef MAGICKCORE_HAVE_POSIX_MADVISE +#define MAGICKCORE_HAVE_POSIX_MADVISE 1 +#endif /* Define to 1 if you have the `posix_memalign' function. */ -/* #undef HAVE_POSIX_MEMALIGN */ +#ifndef MAGICKCORE_HAVE_POSIX_MEMALIGN +#define MAGICKCORE_HAVE_POSIX_MEMALIGN 1 +#endif /* Define to 1 if you have the `posix_spawnp' function. */ -/* #undef HAVE_POSIX_SPAWNP */ +#ifndef MAGICKCORE_HAVE_POSIX_SPAWNP +#define MAGICKCORE_HAVE_POSIX_SPAWNP 1 +#endif /* Define to 1 if you have the `pow' function. */ -/* #undef HAVE_POW */ +#ifndef MAGICKCORE_HAVE_POW +#define MAGICKCORE_HAVE_POW 1 +#endif /* Define to 1 if you have the `pread' function. */ -/* #undef HAVE_PREAD */ +#ifndef MAGICKCORE_HAVE_PREAD +#define MAGICKCORE_HAVE_PREAD 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_PROCESS_H */ @@ -397,67 +571,107 @@ #endif /* Define to 1 if you have the `pwrite' function. */ -/* #undef HAVE_PWRITE */ +#ifndef MAGICKCORE_HAVE_PWRITE +#define MAGICKCORE_HAVE_PWRITE 1 +#endif /* Define to 1 if you have the `qsort_r' function. */ -/* #undef HAVE_QSORT_R */ +#ifndef MAGICKCORE_HAVE_QSORT_R +#define MAGICKCORE_HAVE_QSORT_R 1 +#endif /* Define to 1 if you have the `raise' function. */ -/* #undef HAVE_RAISE */ +#ifndef MAGICKCORE_HAVE_RAISE +#define MAGICKCORE_HAVE_RAISE 1 +#endif /* Define to 1 if you have the `rand_r' function. */ -/* #undef HAVE_RAND_R */ +#ifndef MAGICKCORE_HAVE_RAND_R +#define MAGICKCORE_HAVE_RAND_R 1 +#endif /* Define to 1 if you have the `readdir_r' function. */ -/* #undef HAVE_READDIR_R */ +#ifndef MAGICKCORE_HAVE_READDIR_R +#define MAGICKCORE_HAVE_READDIR_R 1 +#endif /* Define to 1 if you have the `readlink' function. */ -/* #undef HAVE_READLINK */ +#ifndef MAGICKCORE_HAVE_READLINK +#define MAGICKCORE_HAVE_READLINK 1 +#endif /* Define to 1 if you have the `realpath' function. */ -/* #undef HAVE_REALPATH */ +#ifndef MAGICKCORE_HAVE_REALPATH +#define MAGICKCORE_HAVE_REALPATH 1 +#endif /* Define to 1 if you have the `seekdir' function. */ -/* #undef HAVE_SEEKDIR */ +#ifndef MAGICKCORE_HAVE_SEEKDIR +#define MAGICKCORE_HAVE_SEEKDIR 1 +#endif /* Define to 1 if you have the `select' function. */ -/* #undef HAVE_SELECT */ +#ifndef MAGICKCORE_HAVE_SELECT +#define MAGICKCORE_HAVE_SELECT 1 +#endif /* Define to 1 if you have the `setlocale' function. */ -/* #undef HAVE_SETLOCALE */ +#ifndef MAGICKCORE_HAVE_SETLOCALE +#define MAGICKCORE_HAVE_SETLOCALE 1 +#endif /* Define to 1 if you have the `setvbuf' function. */ -/* #undef HAVE_SETVBUF */ +#ifndef MAGICKCORE_HAVE_SETVBUF +#define MAGICKCORE_HAVE_SETVBUF 1 +#endif /* X11 server supports shape extension */ -/* #undef HAVE_SHAPE */ +#ifndef MAGICKCORE_HAVE_SHAPE +#define MAGICKCORE_HAVE_SHAPE 1 +#endif /* X11 server supports shared memory extension */ -/* #undef HAVE_SHARED_MEMORY */ +#ifndef MAGICKCORE_HAVE_SHARED_MEMORY +#define MAGICKCORE_HAVE_SHARED_MEMORY 1 +#endif /* Define to 1 if you have the `sigaction' function. */ -/* #undef HAVE_SIGACTION */ +#ifndef MAGICKCORE_HAVE_SIGACTION +#define MAGICKCORE_HAVE_SIGACTION 1 +#endif /* Define to 1 if you have the `sigemptyset' function. */ -/* #undef HAVE_SIGEMPTYSET */ +#ifndef MAGICKCORE_HAVE_SIGEMPTYSET +#define MAGICKCORE_HAVE_SIGEMPTYSET 1 +#endif /* Define to 1 if you have the `socket' function. */ -/* #undef HAVE_SOCKET */ +#ifndef MAGICKCORE_HAVE_SOCKET +#define MAGICKCORE_HAVE_SOCKET 1 +#endif /* Define to 1 if you have the `spawnvp' function. */ /* #undef HAVE_SPAWNVP */ /* Define to 1 if you have the `sqrt' function. */ -/* #undef HAVE_SQRT */ +#ifndef MAGICKCORE_HAVE_SQRT +#define MAGICKCORE_HAVE_SQRT 1 +#endif /* Define to 1 if you have the `stat' function. */ -/* #undef HAVE_STAT */ +#ifndef MAGICKCORE_HAVE_STAT +#define MAGICKCORE_HAVE_STAT 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDARG_H */ +#ifndef MAGICKCORE_HAVE_STDARG_H +#define MAGICKCORE_HAVE_STDARG_H 1 +#endif /* Define to 1 if stdbool.h conforms to C99. */ -/* #undef HAVE_STDBOOL_H */ +#ifndef MAGICKCORE_HAVE_STDBOOL_H +#define MAGICKCORE_HAVE_STDBOOL_H 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_STDINT_H @@ -470,28 +684,44 @@ #endif /* define if the compiler supports ISO C++ standard library */ -/* #undef HAVE_STD_LIBS */ +#ifndef MAGICKCORE_HAVE_STD_LIBS +#define MAGICKCORE_HAVE_STD_LIBS /**/ +#endif /* Define to 1 if you have the `strcasecmp' function. */ -/* #undef HAVE_STRCASECMP */ +#ifndef MAGICKCORE_HAVE_STRCASECMP +#define MAGICKCORE_HAVE_STRCASECMP 1 +#endif /* Define to 1 if you have the `strchr' function. */ -/* #undef HAVE_STRCHR */ +#ifndef MAGICKCORE_HAVE_STRCHR +#define MAGICKCORE_HAVE_STRCHR 1 +#endif /* Define to 1 if you have the `strcspn' function. */ -/* #undef HAVE_STRCSPN */ +#ifndef MAGICKCORE_HAVE_STRCSPN +#define MAGICKCORE_HAVE_STRCSPN 1 +#endif /* Define to 1 if you have the `strdup' function. */ -/* #undef HAVE_STRDUP */ +#ifndef MAGICKCORE_HAVE_STRDUP +#define MAGICKCORE_HAVE_STRDUP 1 +#endif /* Define to 1 if you have the `strerror' function. */ -/* #undef HAVE_STRERROR */ +#ifndef MAGICKCORE_HAVE_STRERROR +#define MAGICKCORE_HAVE_STRERROR 1 +#endif /* Define to 1 if you have the `strerror_r' function. */ -/* #undef HAVE_STRERROR_R */ +#ifndef MAGICKCORE_HAVE_STRERROR_R +#define MAGICKCORE_HAVE_STRERROR_R 1 +#endif /* Define to 1 if cpp supports the ANSI # stringizing operator. */ -/* #undef HAVE_STRINGIZE */ +#ifndef MAGICKCORE_HAVE_STRINGIZE +#define MAGICKCORE_HAVE_STRINGIZE 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_STRINGS_H @@ -510,84 +740,128 @@ /* #undef HAVE_STRLCPY */ /* Define to 1 if you have the `strncasecmp' function. */ -/* #undef HAVE_STRNCASECMP */ +#ifndef MAGICKCORE_HAVE_STRNCASECMP +#define MAGICKCORE_HAVE_STRNCASECMP 1 +#endif /* Define to 1 if you have the `strpbrk' function. */ -/* #undef HAVE_STRPBRK */ +#ifndef MAGICKCORE_HAVE_STRPBRK +#define MAGICKCORE_HAVE_STRPBRK 1 +#endif /* Define to 1 if you have the `strrchr' function. */ -/* #undef HAVE_STRRCHR */ +#ifndef MAGICKCORE_HAVE_STRRCHR +#define MAGICKCORE_HAVE_STRRCHR 1 +#endif /* Define to 1 if you have the `strspn' function. */ -/* #undef HAVE_STRSPN */ +#ifndef MAGICKCORE_HAVE_STRSPN +#define MAGICKCORE_HAVE_STRSPN 1 +#endif /* Define to 1 if you have the `strstr' function. */ -/* #undef HAVE_STRSTR */ +#ifndef MAGICKCORE_HAVE_STRSTR +#define MAGICKCORE_HAVE_STRSTR 1 +#endif /* Define to 1 if you have the `strtod' function. */ -/* #undef HAVE_STRTOD */ +#ifndef MAGICKCORE_HAVE_STRTOD +#define MAGICKCORE_HAVE_STRTOD 1 +#endif /* Define to 1 if you have the `strtod_l' function. */ -/* #undef HAVE_STRTOD_L */ +#ifndef MAGICKCORE_HAVE_STRTOD_L +#define MAGICKCORE_HAVE_STRTOD_L 1 +#endif /* Define to 1 if you have the `strtol' function. */ -/* #undef HAVE_STRTOL */ +#ifndef MAGICKCORE_HAVE_STRTOL +#define MAGICKCORE_HAVE_STRTOL 1 +#endif /* Define to 1 if you have the `strtoul' function. */ -/* #undef HAVE_STRTOUL */ +#ifndef MAGICKCORE_HAVE_STRTOUL +#define MAGICKCORE_HAVE_STRTOUL 1 +#endif /* Define to 1 if `tm_zone' is a member of `struct tm'. */ -/* #undef HAVE_STRUCT_TM_TM_ZONE */ +#ifndef MAGICKCORE_HAVE_STRUCT_TM_TM_ZONE +#define MAGICKCORE_HAVE_STRUCT_TM_TM_ZONE 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_SUN_PREFETCH_H */ /* Define to 1 if you have the `symlink' function. */ -/* #undef HAVE_SYMLINK */ +#ifndef MAGICKCORE_HAVE_SYMLINK +#define MAGICKCORE_HAVE_SYMLINK 1 +#endif /* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ +#ifndef MAGICKCORE_HAVE_SYSCONF +#define MAGICKCORE_HAVE_SYSCONF 1 +#endif /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_SYS_DIR_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IPC_H */ +#ifndef MAGICKCORE_HAVE_SYS_IPC_H +#define MAGICKCORE_HAVE_SYS_IPC_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ +#ifndef MAGICKCORE_HAVE_SYS_MMAN_H +#define MAGICKCORE_HAVE_SYS_MMAN_H 1 +#endif /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_SYS_NDIR_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ +#ifndef MAGICKCORE_HAVE_SYS_PARAM_H +#define MAGICKCORE_HAVE_SYS_PARAM_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_RESOURCE_H */ +#ifndef MAGICKCORE_HAVE_SYS_RESOURCE_H +#define MAGICKCORE_HAVE_SYS_RESOURCE_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SELECT_H */ +#ifndef MAGICKCORE_HAVE_SYS_SELECT_H +#define MAGICKCORE_HAVE_SYS_SELECT_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SOCKET_H */ +#ifndef MAGICKCORE_HAVE_SYS_SOCKET_H +#define MAGICKCORE_HAVE_SYS_SOCKET_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STAT_H */ +#ifndef MAGICKCORE_HAVE_SYS_STAT_H +#define MAGICKCORE_HAVE_SYS_STAT_H 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_SYSLIMITS_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIMEB_H */ +#ifndef MAGICKCORE_HAVE_SYS_TIMEB_H +#define MAGICKCORE_HAVE_SYS_TIMEB_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIMES_H */ +#ifndef MAGICKCORE_HAVE_SYS_TIMES_H +#define MAGICKCORE_HAVE_SYS_TIMES_H 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIME_H */ +#ifndef MAGICKCORE_HAVE_SYS_TIME_H +#define MAGICKCORE_HAVE_SYS_TIME_H 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_SYS_TYPES_H @@ -595,16 +869,24 @@ #endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_WAIT_H */ +#ifndef MAGICKCORE_HAVE_SYS_WAIT_H +#define MAGICKCORE_HAVE_SYS_WAIT_H 1 +#endif /* Define to 1 if you have the `telldir' function. */ -/* #undef HAVE_TELLDIR */ +#ifndef MAGICKCORE_HAVE_TELLDIR +#define MAGICKCORE_HAVE_TELLDIR 1 +#endif /* Define to 1 if you have the `tempnam' function. */ -/* #undef HAVE_TEMPNAM */ +#ifndef MAGICKCORE_HAVE_TEMPNAM +#define MAGICKCORE_HAVE_TEMPNAM 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_TIFFCONF_H */ +#ifndef MAGICKCORE_HAVE_TIFFCONF_H +#define MAGICKCORE_HAVE_TIFFCONF_H 1 +#endif /* Define to 1 if you have the `TIFFIsBigEndian' function. */ #ifndef MAGICKCORE_HAVE_TIFFISBIGENDIAN @@ -637,7 +919,9 @@ #endif /* Define to 1 if you have the `TIFFSetWarningHandlerExt' function. */ -/* #undef HAVE_TIFFSETWARNINGHANDLEREXT */ +#ifndef MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT +#define MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT 1 +#endif /* Define to 1 if you have the `TIFFSwabArrayOfTriples' function. */ #ifndef MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES @@ -645,21 +929,29 @@ #endif /* Define to 1 if you have the `times' function. */ -/* #undef HAVE_TIMES */ +#ifndef MAGICKCORE_HAVE_TIMES +#define MAGICKCORE_HAVE_TIMES 1 +#endif /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use `HAVE_STRUCT_TM_TM_ZONE' instead. */ -/* #undef HAVE_TM_ZONE */ +#ifndef MAGICKCORE_HAVE_TM_ZONE +#define MAGICKCORE_HAVE_TM_ZONE 1 +#endif /* Define to 1 if you don't have `tm_zone' but do have the external array `tzname'. */ /* #undef HAVE_TZNAME */ /* Define to 1 if the system has the type `uintmax_t'. */ -/* #undef HAVE_UINTMAX_T */ +#ifndef MAGICKCORE_HAVE_UINTMAX_T +#define MAGICKCORE_HAVE_UINTMAX_T 1 +#endif /* Define to 1 if the system has the type `uintptr_t'. */ -/* #undef HAVE_UINTPTR_T */ +#ifndef MAGICKCORE_HAVE_UINTPTR_T +#define MAGICKCORE_HAVE_UINTPTR_T 1 +#endif /* Define to 1 if you have the `ulltostr' function. */ /* #undef HAVE_ULLTOSTR */ @@ -670,67 +962,99 @@ #endif /* Define to 1 if the system has the type 'unsigned long long int'. */ -/* #undef HAVE_UNSIGNED_LONG_LONG_INT */ +#ifndef MAGICKCORE_HAVE_UNSIGNED_LONG_LONG_INT +#define MAGICKCORE_HAVE_UNSIGNED_LONG_LONG_INT 1 +#endif /* Define to 1 if you have the `uselocale' function. */ -/* #undef HAVE_USELOCALE */ +#ifndef MAGICKCORE_HAVE_USELOCALE +#define MAGICKCORE_HAVE_USELOCALE 1 +#endif /* Define to 1 if you have the `usleep' function. */ -/* #undef HAVE_USLEEP */ +#ifndef MAGICKCORE_HAVE_USLEEP +#define MAGICKCORE_HAVE_USLEEP 1 +#endif /* Define to 1 if you have the `utime' function. */ -/* #undef HAVE_UTIME */ +#ifndef MAGICKCORE_HAVE_UTIME +#define MAGICKCORE_HAVE_UTIME 1 +#endif /* Define to 1 if you have the `vfork' function. */ -/* #undef HAVE_VFORK */ +#ifndef MAGICKCORE_HAVE_VFORK +#define MAGICKCORE_HAVE_VFORK 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_VFORK_H */ /* Define to 1 if you have the `vfprintf' function. */ -/* #undef HAVE_VFPRINTF */ +#ifndef MAGICKCORE_HAVE_VFPRINTF +#define MAGICKCORE_HAVE_VFPRINTF 1 +#endif /* Define to 1 if you have the `vfprintf_l' function. */ /* #undef HAVE_VFPRINTF_L */ /* Define to 1 if you have the `vprintf' function. */ -/* #undef HAVE_VPRINTF */ +#ifndef MAGICKCORE_HAVE_VPRINTF +#define MAGICKCORE_HAVE_VPRINTF 1 +#endif /* Define to 1 if you have the `vsnprintf' function. */ -/* #undef HAVE_VSNPRINTF */ +#ifndef MAGICKCORE_HAVE_VSNPRINTF +#define MAGICKCORE_HAVE_VSNPRINTF 1 +#endif /* Define to 1 if you have the `vsnprintf_l' function. */ /* #undef HAVE_VSNPRINTF_L */ /* Define to 1 if you have the `vsprintf' function. */ -/* #undef HAVE_VSPRINTF */ +#ifndef MAGICKCORE_HAVE_VSPRINTF +#define MAGICKCORE_HAVE_VSPRINTF 1 +#endif /* Define to 1 if you have the `waitpid' function. */ -/* #undef HAVE_WAITPID */ +#ifndef MAGICKCORE_HAVE_WAITPID +#define MAGICKCORE_HAVE_WAITPID 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_WCHAR_H */ +#ifndef MAGICKCORE_HAVE_WCHAR_H +#define MAGICKCORE_HAVE_WCHAR_H 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ /* Define to 1 if `fork' works. */ -/* #undef HAVE_WORKING_FORK */ +#ifndef MAGICKCORE_HAVE_WORKING_FORK +#define MAGICKCORE_HAVE_WORKING_FORK 1 +#endif /* Define to 1 if `vfork' works. */ -/* #undef HAVE_WORKING_VFORK */ +#ifndef MAGICKCORE_HAVE_WORKING_VFORK +#define MAGICKCORE_HAVE_WORKING_VFORK 1 +#endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_XLOCALE_H */ +#ifndef MAGICKCORE_HAVE_XLOCALE_H +#define MAGICKCORE_HAVE_XLOCALE_H 1 +#endif /* Define to 1 if you have the `_aligned_malloc' function. */ /* #undef HAVE__ALIGNED_MALLOC */ /* Define to 1 if the system has the type `_Bool'. */ -/* #undef HAVE__BOOL */ +#ifndef MAGICKCORE_HAVE__BOOL +#define MAGICKCORE_HAVE__BOOL 1 +#endif /* Define to 1 if you have the `_exit' function. */ -/* #undef HAVE__EXIT */ +#ifndef MAGICKCORE_HAVE__EXIT +#define MAGICKCORE_HAVE__EXIT 1 +#endif /* Define to 1 if you have the `_NSGetExecutablePath' function. */ /* #undef HAVE__NSGETEXECUTABLEPATH */ @@ -753,7 +1077,9 @@ #endif /* Whether hdri is enabled or not */ -/* #undef HDRI_ENABLE_OBSOLETE_IN_H */ +#ifndef MAGICKCORE_HDRI_ENABLE_OBSOLETE_IN_H +#define MAGICKCORE_HDRI_ENABLE_OBSOLETE_IN_H 1 +#endif /* Define if you have umem memory allocation library */ /* #undef HasUMEM */ @@ -769,16 +1095,24 @@ #endif /* ImageMagick is formally installed under prefix */ -/* #undef INSTALLED_SUPPORT */ +#ifndef MAGICKCORE_INSTALLED_SUPPORT +#define MAGICKCORE_INSTALLED_SUPPORT 1 +#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 library */ -/* #undef JPEG_DELEGATE */ +#ifndef MAGICKCORE_JPEG_DELEGATE +#define MAGICKCORE_JPEG_DELEGATE 1 +#endif /* Define if you have LCMS (v1.11 or later) library */ -/* #undef LCMS_DELEGATE */ +#ifndef MAGICKCORE_LCMS_DELEGATE +#define MAGICKCORE_LCMS_DELEGATE 1 +#endif /* Define if you have OPENJP2 library */ /* #undef LIBOPENJP2_DELEGATE */ @@ -808,10 +1142,14 @@ /* Define to the sub-directory in which libtool stores uninstalled libraries. */ -/* #undef LT_OBJDIR */ +#ifndef MAGICKCORE_LT_OBJDIR +#define MAGICKCORE_LT_OBJDIR ".libs/" +#endif /* Define if you have LZMA library */ -/* #undef LZMA_DELEGATE */ +#ifndef MAGICKCORE_LZMA_DELEGATE +#define MAGICKCORE_LZMA_DELEGATE 1 +#endif /* Define to prepend to default font search path. */ /* #undef MAGICK_FONT_PATH */ @@ -846,7 +1184,9 @@ /* #undef NDEBUG */ /* Define if you have OPENEXR library */ -/* #undef OPENEXR_DELEGATE */ +#ifndef MAGICKCORE_OPENEXR_DELEGATE +#define MAGICKCORE_OPENEXR_DELEGATE 1 +#endif /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -884,13 +1224,19 @@ #endif /* Define if you have PANGOCAIRO library */ -/* #undef PANGOCAIRO_DELEGATE */ +#ifndef MAGICKCORE_PANGOCAIRO_DELEGATE +#define MAGICKCORE_PANGOCAIRO_DELEGATE 1 +#endif /* Define if you have PANGO library */ -/* #undef PANGO_DELEGATE */ +#ifndef MAGICKCORE_PANGO_DELEGATE +#define MAGICKCORE_PANGO_DELEGATE 1 +#endif /* Define if you have PNG library */ -/* #undef PNG_DELEGATE */ +#ifndef MAGICKCORE_PNG_DELEGATE +#define MAGICKCORE_PNG_DELEGATE 1 +#endif /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -900,22 +1246,32 @@ /* #undef PixelCacheThreshold */ /* Number of bits in a pixel Quantum (8/16/32/64) */ -/* #undef QUANTUM_DEPTH_OBSOLETE_IN_H */ +#ifndef MAGICKCORE_QUANTUM_DEPTH_OBSOLETE_IN_H +#define MAGICKCORE_QUANTUM_DEPTH_OBSOLETE_IN_H 16 +#endif /* Define as the return type of signal handlers (`int' or `void'). */ -/* #undef RETSIGTYPE */ +#ifndef MAGICKCORE_RETSIGTYPE +#define MAGICKCORE_RETSIGTYPE void +#endif /* Define if you have RSVG library */ /* #undef RSVG_DELEGATE */ /* Define to the type of arg 1 for `select'. */ -/* #undef SELECT_TYPE_ARG1 */ +#ifndef MAGICKCORE_SELECT_TYPE_ARG1 +#define MAGICKCORE_SELECT_TYPE_ARG1 int +#endif /* Define to the type of args 2, 3 and 4 for `select'. */ -/* #undef SELECT_TYPE_ARG234 */ +#ifndef MAGICKCORE_SELECT_TYPE_ARG234 +#define MAGICKCORE_SELECT_TYPE_ARG234 (fd_set *) +#endif /* Define to the type of arg 5 for `select'. */ -/* #undef SELECT_TYPE_ARG5 */ +#ifndef MAGICKCORE_SELECT_TYPE_ARG5 +#define MAGICKCORE_SELECT_TYPE_ARG5 (struct timeval *) +#endif /* Sharearch directory name without ABI part. */ #ifndef MAGICKCORE_SHAREARCH_BASEDIRNAME @@ -937,34 +1293,54 @@ #endif /* The size of `double', as computed by sizeof. */ -/* #undef SIZEOF_DOUBLE */ +#ifndef MAGICKCORE_SIZEOF_DOUBLE +#define MAGICKCORE_SIZEOF_DOUBLE 8 +#endif /* The size of `double_t', as computed by sizeof. */ -/* #undef SIZEOF_DOUBLE_T */ +#ifndef MAGICKCORE_SIZEOF_DOUBLE_T +#define MAGICKCORE_SIZEOF_DOUBLE_T 8 +#endif /* The size of `float', as computed by sizeof. */ -/* #undef SIZEOF_FLOAT */ +#ifndef MAGICKCORE_SIZEOF_FLOAT +#define MAGICKCORE_SIZEOF_FLOAT 4 +#endif /* The size of `float_t', as computed by sizeof. */ -/* #undef SIZEOF_FLOAT_T */ +#ifndef MAGICKCORE_SIZEOF_FLOAT_T +#define MAGICKCORE_SIZEOF_FLOAT_T 4 +#endif /* The size of `long double', as computed by sizeof. */ -/* #undef SIZEOF_LONG_DOUBLE */ +#ifndef MAGICKCORE_SIZEOF_LONG_DOUBLE +#define MAGICKCORE_SIZEOF_LONG_DOUBLE 16 +#endif /* The size of `off_t', as computed by sizeof. */ -/* #undef SIZEOF_OFF_T */ +#ifndef MAGICKCORE_SIZEOF_OFF_T +#define MAGICKCORE_SIZEOF_OFF_T 8 +#endif /* The size of `signed int', as computed by sizeof. */ -/* #undef SIZEOF_SIGNED_INT */ +#ifndef MAGICKCORE_SIZEOF_SIGNED_INT +#define MAGICKCORE_SIZEOF_SIGNED_INT 4 +#endif /* The size of `signed long', as computed by sizeof. */ -/* #undef SIZEOF_SIGNED_LONG */ +#ifndef MAGICKCORE_SIZEOF_SIGNED_LONG +#define MAGICKCORE_SIZEOF_SIGNED_LONG 8 +#endif /* The size of `signed long long', as computed by sizeof. */ -/* #undef SIZEOF_SIGNED_LONG_LONG */ +#ifndef MAGICKCORE_SIZEOF_SIGNED_LONG_LONG +#define MAGICKCORE_SIZEOF_SIGNED_LONG_LONG 8 +#endif /* The size of `signed short', as computed by sizeof. */ -/* #undef SIZEOF_SIGNED_SHORT */ +#ifndef MAGICKCORE_SIZEOF_SIGNED_SHORT +#define MAGICKCORE_SIZEOF_SIGNED_SHORT 2 +#endif /* The size of `size_t', as computed by sizeof. */ #ifndef MAGICKCORE_SIZEOF_SIZE_T @@ -972,31 +1348,47 @@ #endif /* The size of `ssize_t', as computed by sizeof. */ -/* #undef SIZEOF_SSIZE_T */ +#ifndef MAGICKCORE_SIZEOF_SSIZE_T +#define MAGICKCORE_SIZEOF_SSIZE_T 8 +#endif /* The size of `unsigned int', as computed by sizeof. */ -/* #undef SIZEOF_UNSIGNED_INT */ +#ifndef MAGICKCORE_SIZEOF_UNSIGNED_INT +#define MAGICKCORE_SIZEOF_UNSIGNED_INT 4 +#endif /* The size of `unsigned int*', as computed by sizeof. */ -/* #undef SIZEOF_UNSIGNED_INTP */ +#ifndef MAGICKCORE_SIZEOF_UNSIGNED_INTP +#define MAGICKCORE_SIZEOF_UNSIGNED_INTP 8 +#endif /* The size of `unsigned long', as computed by sizeof. */ -/* #undef SIZEOF_UNSIGNED_LONG */ +#ifndef MAGICKCORE_SIZEOF_UNSIGNED_LONG +#define MAGICKCORE_SIZEOF_UNSIGNED_LONG 8 +#endif /* The size of `unsigned long long', as computed by sizeof. */ -/* #undef SIZEOF_UNSIGNED_LONG_LONG */ +#ifndef MAGICKCORE_SIZEOF_UNSIGNED_LONG_LONG +#define MAGICKCORE_SIZEOF_UNSIGNED_LONG_LONG 8 +#endif /* The size of `unsigned short', as computed by sizeof. */ -/* #undef SIZEOF_UNSIGNED_SHORT */ +#ifndef MAGICKCORE_SIZEOF_UNSIGNED_SHORT +#define MAGICKCORE_SIZEOF_UNSIGNED_SHORT 2 +#endif /* Define to 1 if the `S_IS*' macros in do not work properly. */ /* #undef STAT_MACROS_BROKEN */ /* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ +#ifndef MAGICKCORE_STDC_HEADERS +#define MAGICKCORE_STDC_HEADERS 1 +#endif /* Define to 1 if strerror_r returns char *. */ -/* #undef STRERROR_R_CHAR_P */ +#ifndef MAGICKCORE_STRERROR_R_CHAR_P +#define MAGICKCORE_STRERROR_R_CHAR_P 1 +#endif /* Define if you have POSIX threads libraries and header files. */ #ifndef MAGICKCORE_THREAD_SUPPORT @@ -1004,10 +1396,14 @@ #endif /* Define if you have TIFF library */ -/* #undef TIFF_DELEGATE */ +#ifndef MAGICKCORE_TIFF_DELEGATE +#define MAGICKCORE_TIFF_DELEGATE 1 +#endif /* Define to 1 if you can safely include both and . */ -/* #undef TIME_WITH_SYS_TIME */ +#ifndef MAGICKCORE_TIME_WITH_SYS_TIME +#define MAGICKCORE_TIME_WITH_SYS_TIME 1 +#endif /* Define to 1 if your declares `struct tm'. */ /* #undef TM_IN_SYS_TIME */ @@ -1069,13 +1465,19 @@ #endif /* Location of X11 configure files */ -/* #undef X11_CONFIGURE_PATH */ +#ifndef MAGICKCORE_X11_CONFIGURE_PATH +#define MAGICKCORE_X11_CONFIGURE_PATH "" +#endif /* Define if you have X11 library */ -/* #undef X11_DELEGATE */ +#ifndef MAGICKCORE_X11_DELEGATE +#define MAGICKCORE_X11_DELEGATE 1 +#endif /* Define if you have XML library */ -/* #undef XML_DELEGATE */ +#ifndef MAGICKCORE_XML_DELEGATE +#define MAGICKCORE_XML_DELEGATE 1 +#endif /* Define to 1 if the X Window System is missing or not being used. */ /* #undef X_DISPLAY_MISSING */ @@ -1084,7 +1486,9 @@ /* #undef ZERO_CONFIGURATION_SUPPORT */ /* Define if you have zlib compression library */ -/* #undef ZLIB_DELEGATE */ +#ifndef MAGICKCORE_ZLIB_DELEGATE +#define MAGICKCORE_ZLIB_DELEGATE 1 +#endif /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE @@ -1190,7 +1594,9 @@ /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is supported directly. */ -/* #undef restrict */ +#ifndef _magickcore_restrict +#define _magickcore_restrict __restrict +#endif /* Work around a bug in Sun C++: it does not support _Restrict or __restrict__, even though the corresponding Sun C compiler ends up with "#define restrict _Restrict" or "#define restrict __restrict__" in the diff --git a/MagickCore/version.h b/MagickCore/version.h index 1963384ca..9e057f5ac 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2014 ImageMagick Studio LLC" -#define MagickSVNRevision "15458:15492M" +#define MagickSVNRevision "15511:15513" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -48,11 +48,11 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2014-04-19" +#define MagickReleaseDate "2014-04-22" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" -#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jbig jng jpeg lcms lzma openexr pango png ps tiff webp x zlib" +#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jbig jng jpeg lcms lzma openexr pango png ps tiff webp x xml zlib" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/Makefile.in b/Makefile.in index 1f8a0b179..67d5fafde 100644 --- a/Makefile.in +++ b/Makefile.in @@ -413,14 +413,14 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_DEPENDENC am__dirstamp = $(am__leading_dot)dirstamp am_Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = \ Magick++/lib/Blob.lo Magick++/lib/BlobRef.lo \ - Magick++/lib/CoderInfo.lo Magick++/lib/Color.lo \ - Magick++/lib/Drawable.lo Magick++/lib/Exception.lo \ - Magick++/lib/Functions.lo Magick++/lib/Geometry.lo \ - Magick++/lib/Image.lo Magick++/lib/ImageRef.lo \ - Magick++/lib/Montage.lo Magick++/lib/Options.lo \ - Magick++/lib/Pixels.lo Magick++/lib/ResourceLimits.lo \ - Magick++/lib/STL.lo Magick++/lib/Thread.lo \ - Magick++/lib/TypeMetric.lo + Magick++/lib/ChannelMoments.lo Magick++/lib/CoderInfo.lo \ + Magick++/lib/Color.lo Magick++/lib/Drawable.lo \ + Magick++/lib/Exception.lo Magick++/lib/Functions.lo \ + Magick++/lib/Geometry.lo Magick++/lib/Image.lo \ + Magick++/lib/ImageRef.lo Magick++/lib/Montage.lo \ + Magick++/lib/Options.lo Magick++/lib/Pixels.lo \ + Magick++/lib/ResourceLimits.lo Magick++/lib/STL.lo \ + Magick++/lib/Thread.lo Magick++/lib/TypeMetric.lo Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -2283,6 +2283,7 @@ MANS = $(man_MANS) DATA = $(configlib_DATA) $(configshare_DATA) $(configsharearch_DATA) \ $(doc_DATA) $(pkgconfig_DATA) am__magickppinc_HEADERS_DIST = Magick++/lib/Magick++/Blob.h \ + Magick++/lib/Magick++/ChannelMoments.h \ Magick++/lib/Magick++/CoderInfo.h \ Magick++/lib/Magick++/Color.h Magick++/lib/Magick++/Drawable.h \ Magick++/lib/Magick++/Exception.h \ @@ -4774,6 +4775,7 @@ MAGICKPP_CLEANFILES = \ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = \ Magick++/lib/Blob.cpp \ Magick++/lib/BlobRef.cpp \ + Magick++/lib/ChannelMoments.cpp \ Magick++/lib/CoderInfo.cpp \ Magick++/lib/Color.cpp \ Magick++/lib/Drawable.cpp \ @@ -4792,6 +4794,7 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = Magick++/lib/Magick++.h \ Magick++/lib/Magick++/Blob.h \ Magick++/lib/Magick++/BlobRef.h \ + Magick++/lib/Magick++/ChannelMoments.h \ Magick++/lib/Magick++/CoderInfo.h \ Magick++/lib/Magick++/Color.h \ Magick++/lib/Magick++/Drawable.h \ @@ -4818,6 +4821,7 @@ magickppincdir = $(INCLUDE_PATH)/Magick++ magickppinc_HEADERS = $(MAGICKPP_INCHEADERS) MAGICKPP_INCHEADERS_OPT = \ Magick++/lib/Magick++/Blob.h \ + Magick++/lib/Magick++/ChannelMoments.h \ Magick++/lib/Magick++/CoderInfo.h \ Magick++/lib/Magick++/Color.h \ Magick++/lib/Magick++/Drawable.h \ @@ -5399,6 +5403,8 @@ Magick++/lib/Blob.lo: Magick++/lib/$(am__dirstamp) \ Magick++/lib/$(DEPDIR)/$(am__dirstamp) Magick++/lib/BlobRef.lo: Magick++/lib/$(am__dirstamp) \ Magick++/lib/$(DEPDIR)/$(am__dirstamp) +Magick++/lib/ChannelMoments.lo: Magick++/lib/$(am__dirstamp) \ + Magick++/lib/$(DEPDIR)/$(am__dirstamp) Magick++/lib/CoderInfo.lo: Magick++/lib/$(am__dirstamp) \ Magick++/lib/$(DEPDIR)/$(am__dirstamp) Magick++/lib/Color.lo: Magick++/lib/$(am__dirstamp) \ @@ -7048,6 +7054,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@Magick++/demo/$(DEPDIR)/zoom.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Blob.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/BlobRef.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/ChannelMoments.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/CoderInfo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Color.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Drawable.Plo@am__quote@ diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index a17b085c1..f5b1b7eea 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -161,7 +161,7 @@ foreach my $delegate (@tested_delegates) { } # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile -my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I"' . $Config{'usrinc'} . '/ImageMagick"'; +my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm'; my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} "; @@ -209,7 +209,7 @@ WriteMakefile #'CC' => 'gcc -std=gnu99 -std=gnu99', # C pre-processor flags (e.g. -I & -D options) - # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16", + # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, diff --git a/configure b/configure index 2532c1f1c..3297b3203 100755 --- a/configure +++ b/configure @@ -3697,7 +3697,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=15458:15492M +MAGICK_SVN_REVISION=15511:15513 # Substitute library versioning