(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 63f2c86816056feea6186835aae4b8e089b0cacb..0c79656f947ac5ed52a3c6eb1c3acc6beb9e5f81 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -251,7 +251,7 @@
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
 #ifndef MAGICKCORE_HAVE_DECL_STRERROR_R
-#define MAGICKCORE_HAVE_DECL_STRERROR_R 0
+#define MAGICKCORE_HAVE_DECL_STRERROR_R 1
 #endif
 
 /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
@@ -340,7 +340,9 @@
 #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 <ft2build.h> header file. */
 #ifndef MAGICKCORE_HAVE_FT2BUILD_H
@@ -406,7 +408,9 @@
 #endif
 
 /* 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'. */
 #ifndef MAGICKCORE_HAVE_INTPTR_T
@@ -414,7 +418,9 @@
 #endif
 
 /* Define to 1 if you have the <inttypes.h> 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. */
 #ifndef MAGICKCORE_HAVE_ISNAN
@@ -524,7 +530,9 @@
 #endif
 
 /* Define to 1 if you have the <memory.h> 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. */
 #ifndef MAGICKCORE_HAVE_MEMSET
@@ -644,10 +652,14 @@
 /* #undef HAVE_PROCESS_H */
 
 /* Define if you have POSIX threads libraries and header files. */
-/* #undef HAVE_PTHREAD */
+#ifndef MAGICKCORE_HAVE_PTHREAD
+#define MAGICKCORE_HAVE_PTHREAD 1
+#endif
 
 /* Have PTHREAD_PRIO_INHERIT. */
-/* #undef HAVE_PTHREAD_PRIO_INHERIT */
+#ifndef MAGICKCORE_HAVE_PTHREAD_PRIO_INHERIT
+#define MAGICKCORE_HAVE_PTHREAD_PRIO_INHERIT 1
+#endif
 
 /* Define to 1 if you have the `pwrite' function. */
 #ifndef MAGICKCORE_HAVE_PWRITE
@@ -756,7 +768,9 @@
 #endif
 
 /* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
+#ifndef MAGICKCORE_HAVE_STDINT_H
+#define MAGICKCORE_HAVE_STDINT_H 1
+#endif
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #ifndef MAGICKCORE_HAVE_STDLIB_H
@@ -804,10 +818,14 @@
 #endif
 
 /* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
+#ifndef MAGICKCORE_HAVE_STRINGS_H
+#define MAGICKCORE_HAVE_STRINGS_H 1
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
-/* #undef HAVE_STRING_H */
+#ifndef MAGICKCORE_HAVE_STRING_H
+#define MAGICKCORE_HAVE_STRING_H 1
+#endif
 
 /* Define to 1 if you have the `strlcat' function. */
 /* #undef HAVE_STRLCAT */
@@ -920,7 +938,9 @@
 #endif
 
 /* Define to 1 if you have the <sys/stat.h> 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 <sys/syslimits.h> header file. */
 /* #undef HAVE_SYS_SYSLIMITS_H */
@@ -941,7 +961,9 @@
 #endif
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef HAVE_SYS_TYPES_H */
+#ifndef MAGICKCORE_HAVE_SYS_TYPES_H
+#define MAGICKCORE_HAVE_SYS_TYPES_H 1
+#endif
 
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #ifndef MAGICKCORE_HAVE_SYS_WAIT_H
@@ -1019,10 +1041,14 @@
 /* #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 */
@@ -1148,7 +1174,9 @@
 /* #undef HAVE__WSTAT */
 
 /* define if your compiler has __attribute__ */
-/* #undef HAVE___ATTRIBUTE__ */
+#ifndef MAGICKCORE_HAVE___ATTRIBUTE__
+#define MAGICKCORE_HAVE___ATTRIBUTE__ 1
+#endif
 
 /* accurately represent the wide range of intensity levels in real scenes */
 #ifndef MAGICKCORE_HDRI_SUPPORT
@@ -1172,7 +1200,9 @@
 /* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
-/* #undef JP2_DELEGATE */
+#ifndef MAGICKCORE_JP2_DELEGATE
+#define MAGICKCORE_JP2_DELEGATE 1
+#endif
 
 /* Define if you have JPEG library */
 #ifndef MAGICKCORE_JPEG_DELEGATE
@@ -1250,13 +1280,19 @@
 /* #undef MAGICK_FONT_PATH */
 
 /* Target Host CPU */
-/* #undef MAGICK_TARGET_CPU */
+#ifndef MAGICKCORE_MAGICK_TARGET_CPU
+#define MAGICKCORE_MAGICK_TARGET_CPU x86_64
+#endif
 
 /* Target Host OS */
-/* #undef MAGICK_TARGET_OS */
+#ifndef MAGICKCORE_MAGICK_TARGET_OS
+#define MAGICKCORE_MAGICK_TARGET_OS linux-gnu
+#endif
 
 /* Target Host Vendor */
-/* #undef MAGICK_TARGET_VENDOR */
+#ifndef MAGICKCORE_MAGICK_TARGET_VENDOR
+#define MAGICKCORE_MAGICK_TARGET_VENDOR unknown
+#endif
 
 /* Magick API method prefix */
 /* #undef NAMESPACE_PREFIX */
@@ -1276,25 +1312,39 @@
 #endif
 
 /* Name of package */
-/* #undef PACKAGE */
+#ifndef MAGICKCORE_PACKAGE
+#define MAGICKCORE_PACKAGE "ImageMagick"
+#endif
 
 /* Define to the address where bug reports for this package should be sent. */
-/* #undef PACKAGE_BUGREPORT */
+#ifndef MAGICKCORE_PACKAGE_BUGREPORT
+#define MAGICKCORE_PACKAGE_BUGREPORT "http://www.imagemagick.org"
+#endif
 
 /* Define to the full name of this package. */
-/* #undef PACKAGE_NAME */
+#ifndef MAGICKCORE_PACKAGE_NAME
+#define MAGICKCORE_PACKAGE_NAME "ImageMagick"
+#endif
 
 /* Define to the full name and version of this package. */
-/* #undef PACKAGE_STRING */
+#ifndef MAGICKCORE_PACKAGE_STRING
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.0-0"
+#endif
 
 /* Define to the one symbol short name of this package. */
-/* #undef PACKAGE_TARNAME */
+#ifndef MAGICKCORE_PACKAGE_TARNAME
+#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick"
+#endif
 
 /* Define to the home page for this package. */
-/* #undef PACKAGE_URL */
+#ifndef MAGICKCORE_PACKAGE_URL
+#define MAGICKCORE_PACKAGE_URL ""
+#endif
 
 /* Define to the version of this package. */
-/* #undef PACKAGE_VERSION */
+#ifndef MAGICKCORE_PACKAGE_VERSION
+#define MAGICKCORE_PACKAGE_VERSION "7.0.0-0"
+#endif
 
 /* Define if you have PANGOCAIRO library */
 #ifndef MAGICKCORE_PANGOCAIRO_DELEGATE
@@ -1442,7 +1492,9 @@
 #endif
 
 /* Define if you have POSIX threads libraries and header files. */
-/* #undef THREAD_SUPPORT */
+#ifndef MAGICKCORE_THREAD_SUPPORT
+#define MAGICKCORE_THREAD_SUPPORT 1
+#endif
 
 /* Define if you have TIFF library */
 #ifndef MAGICKCORE_TIFF_DELEGATE
@@ -1459,28 +1511,30 @@
 
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
-/* # undef _ALL_SOURCE */
+# define _ALL_SOURCE 1
 #endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
-/* # undef _GNU_SOURCE */
+# define _GNU_SOURCE 1
 #endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
-/* # undef _POSIX_PTHREAD_SEMANTICS */
+# define _POSIX_PTHREAD_SEMANTICS 1
 #endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
-/* # undef _TANDEM_SOURCE */
+# define _TANDEM_SOURCE 1
 #endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
-/* # undef __EXTENSIONS__ */
+# define __EXTENSIONS__ 1
 #endif
 
 
 /* Version number of package */
-/* #undef VERSION */
+#ifndef MAGICKCORE_VERSION
+#define MAGICKCORE_VERSION "7.0.0-0"
+#endif
 
 /* Define if you have WEBP library */
 /* #undef WEBP_DELEGATE */
@@ -1568,23 +1622,17 @@
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
-#ifndef MAGICKCORE__UINT32_T
-#define MAGICKCORE__UINT32_T 1
-#endif
+/* #undef _UINT32_T */
 
 /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
-#ifndef MAGICKCORE__UINT64_T
-#define MAGICKCORE__UINT64_T 1
-#endif
+/* #undef _UINT64_T */
 
 /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
-#ifndef MAGICKCORE__UINT8_T
-#define MAGICKCORE__UINT8_T 1
-#endif
+/* #undef _UINT8_T */
 
 /* Define to 1 if type `char' is unsigned and you are not using gcc.  */
 #ifndef __CHAR_UNSIGNED__
@@ -1627,9 +1675,7 @@
 
 /* Define to the widest signed integer type if <stdint.h> and <inttypes.h> do
    not define. */
-#ifndef _magickcore_intmax_t
-#define _magickcore_intmax_t long long int
-#endif
+/* #undef intmax_t */
 
 /* Define to the type of a signed integer type wide enough to hold a pointer,
    if such a type exists, and if the system does not define it. */
@@ -1674,39 +1720,27 @@
 
 /* Define to the type of an unsigned integer type of width exactly 16 bits if
    such a type exists and the standard includes do not define it. */
-#ifndef _magickcore_uint16_t
-#define _magickcore_uint16_t unsigned short int
-#endif
+/* #undef uint16_t */
 
 /* Define to the type of an unsigned integer type of width exactly 32 bits if
    such a type exists and the standard includes do not define it. */
-#ifndef _magickcore_uint32_t
-#define _magickcore_uint32_t unsigned int
-#endif
+/* #undef uint32_t */
 
 /* Define to the type of an unsigned integer type of width exactly 64 bits if
    such a type exists and the standard includes do not define it. */
-#ifndef _magickcore_uint64_t
-#define _magickcore_uint64_t unsigned long int
-#endif
+/* #undef uint64_t */
 
 /* Define to the type of an unsigned integer type of width exactly 8 bits if
    such a type exists and the standard includes do not define it. */
-#ifndef _magickcore_uint8_t
-#define _magickcore_uint8_t unsigned char
-#endif
+/* #undef uint8_t */
 
 /* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h>
    do not define. */
-#ifndef _magickcore_uintmax_t
-#define _magickcore_uintmax_t unsigned long long int
-#endif
+/* #undef uintmax_t */
 
 /* Define to the type of an unsigned integer type wide enough to hold a
    pointer, if such a type exists, and if the system does not define it. */
-#ifndef _magickcore_uintptr_t
-#define _magickcore_uintptr_t unsigned long int
-#endif
+/* #undef uintptr_t */
 
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 7237e375fcc3ef22b884868f22987e13c1ac41ea..dd6533be45aa23b1efc09f47ac47653b67d86989 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9358:9366M"
+#define MagickSVNRevision  "9382:9384M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-09-15"
+#define MagickReleaseDate  "2012-09-16"
 #define MagickChangeDate   "20120911"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)