From 3e19348661aaad1e8fc43e2d0f95cb8a053da3fd Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 23 May 2013 11:54:34 +0000 Subject: [PATCH] --- MagickCore/magick-baseconfig.h | 36 ++--- MagickCore/version.h | 4 +- configure | 232 +-------------------------------- configure.ac | 9 -- 4 files changed, 14 insertions(+), 267 deletions(-) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index fcce34a9a..b61dac060 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -230,9 +230,7 @@ /* #undef HAVE_DOPRNT */ /* Define to 1 if the system has the type `double_t'. */ -#ifndef MAGICKCORE_HAVE_DOUBLE_T -#define MAGICKCORE_HAVE_DOUBLE_T 1 -#endif +/* #undef HAVE_DOUBLE_T */ /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_ERRNO_H @@ -255,9 +253,7 @@ #endif /* Define to 1 if the system has the type `float_t'. */ -#ifndef MAGICKCORE_HAVE_FLOAT_T -#define MAGICKCORE_HAVE_FLOAT_T 1 -#endif +/* #undef HAVE_FLOAT_T */ /* Define to 1 if you have the `floor' function. */ #ifndef MAGICKCORE_HAVE_FLOOR @@ -1294,9 +1290,7 @@ #endif /* The size of `double_t', as computed by sizeof. */ -#ifndef MAGICKCORE_SIZEOF_DOUBLE_T -#define MAGICKCORE_SIZEOF_DOUBLE_T 8 -#endif +/* #undef SIZEOF_DOUBLE_T */ /* The size of `float', as computed by sizeof. */ #ifndef MAGICKCORE_SIZEOF_FLOAT @@ -1304,19 +1298,13 @@ #endif /* The size of `float_t', as computed by sizeof. */ -#ifndef MAGICKCORE_SIZEOF_FLOAT_T -#define MAGICKCORE_SIZEOF_FLOAT_T 4 -#endif +/* #undef SIZEOF_FLOAT_T */ /* The size of `long double', as computed by sizeof. */ -#ifndef MAGICKCORE_SIZEOF_LONG_DOUBLE -#define MAGICKCORE_SIZEOF_LONG_DOUBLE 16 -#endif +/* #undef SIZEOF_LONG_DOUBLE */ /* The size of `off_t', as computed by sizeof. */ -#ifndef MAGICKCORE_SIZEOF_OFF_T -#define MAGICKCORE_SIZEOF_OFF_T 8 -#endif +/* #undef SIZEOF_OFF_T */ /* The size of `signed int', as computed by sizeof. */ #ifndef MAGICKCORE_SIZEOF_SIGNED_INT @@ -1339,14 +1327,10 @@ #endif /* The size of `size_t', as computed by sizeof. */ -#ifndef MAGICKCORE_SIZEOF_SIZE_T -#define MAGICKCORE_SIZEOF_SIZE_T 8 -#endif +/* #undef SIZEOF_SIZE_T */ /* The size of `ssize_t', as computed by sizeof. */ -#ifndef MAGICKCORE_SIZEOF_SSIZE_T -#define MAGICKCORE_SIZEOF_SSIZE_T 8 -#endif +/* #undef SIZEOF_SSIZE_T */ /* The size of `unsigned int', as computed by sizeof. */ #ifndef MAGICKCORE_SIZEOF_UNSIGNED_INT @@ -1432,7 +1416,9 @@ #endif /* Define if you have WEBP library */ -/* #undef WEBP_DELEGATE */ +#ifndef MAGICKCORE_WEBP_DELEGATE +#define MAGICKCORE_WEBP_DELEGATE 1 +#endif /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 21734ea18..0f4c95adb 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "12315:12320M" +#define MagickSVNRevision "12315:12337M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-05-20" +#define MagickReleaseDate "2013-05-23" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/configure b/configure index 139b24614..cb6f788a0 100755 --- a/configure +++ b/configure @@ -3679,7 +3679,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=12315:12320M +MAGICK_SVN_REVISION=12315:12337M # Substitute library versioning @@ -23240,98 +23240,6 @@ $as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h fi -# Float_t and double_t are intended to be the the most efficient type. -ac_fn_c_check_type "$LINENO" "float_t" "ac_cv_type_float_t" "#include -" -if test "x$ac_cv_type_float_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_FLOAT_T 1 -_ACEOF - - -fi - -ac_fn_c_check_type "$LINENO" "double_t" "ac_cv_type_double_t" "#include -" -if test "x$ac_cv_type_double_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_DOUBLE_T 1 -_ACEOF - - -fi - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float_t" >&5 -$as_echo_n "checking size of float_t... " >&6; } -if ${ac_cv_sizeof_float_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float_t))" "ac_cv_sizeof_float_t" "#include -"; then : - -else - if test "$ac_cv_type_float_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (float_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_float_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float_t" >&5 -$as_echo "$ac_cv_sizeof_float_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_FLOAT_T $ac_cv_sizeof_float_t -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double_t" >&5 -$as_echo_n "checking size of double_t... " >&6; } -if ${ac_cv_sizeof_double_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double_t))" "ac_cv_sizeof_double_t" "#include -"; then : - -else - if test "$ac_cv_type_double_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (double_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_double_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double_t" >&5 -$as_echo "$ac_cv_sizeof_double_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_DOUBLE_T $ac_cv_sizeof_double_t -_ACEOF - - - # Get size of float, double and long double for comparaison. # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects @@ -23399,39 +23307,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5 -$as_echo_n "checking size of long double... " >&6; } -if ${ac_cv_sizeof_long_double+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_long_double" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long double) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long_double=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5 -$as_echo "$ac_cv_sizeof_long_double" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double -_ACEOF - - # Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT # The cast to long int works around a bug in the HP C Compiler @@ -23716,111 +23591,6 @@ _ACEOF -# Obtain size of off_t and define as SIZEOF_OFF_T -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 -$as_echo_n "checking size of off_t... " >&6; } -if ${ac_cv_sizeof_off_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_off_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (off_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_off_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -$as_echo "$ac_cv_sizeof_off_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -_ACEOF - - - -# Obtain size of size_t and define as SIZEOF_SIZE_T -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 -$as_echo_n "checking size of size_t... " >&6; } -if ${ac_cv_sizeof_size_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_size_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (size_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_size_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -$as_echo "$ac_cv_sizeof_size_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t -_ACEOF - - - -# Obtain size of ssize_t and define as SIZEOF_SSIZE_T -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 -$as_echo_n "checking size of ssize_t... " >&6; } -if ${ac_cv_sizeof_ssize_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_ssize_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (ssize_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_ssize_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5 -$as_echo "$ac_cv_sizeof_ssize_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t -_ACEOF - - - # Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects diff --git a/configure.ac b/configure.ac index f35508126..d02a485d7 100755 --- a/configure.ac +++ b/configure.ac @@ -965,15 +965,6 @@ AC_CHECK_SIZEOF(signed long long) # supported then the value defined is zero. AC_CHECK_SIZEOF(unsigned long long) -# Obtain size of off_t and define as SIZEOF_OFF_T -AC_CHECK_SIZEOF(off_t) - -# Obtain size of size_t and define as SIZEOF_SIZE_T -AC_CHECK_SIZEOF(size_t) - -# Obtain size of ssize_t and define as SIZEOF_SSIZE_T -AC_CHECK_SIZEOF(ssize_t) - # Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP AC_CHECK_SIZEOF(unsigned int*) -- 2.40.0