From 9a4137e5a4d70fd472cec6d6800823990bd2ec35 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 4 Jan 2013 18:49:29 +0000 Subject: [PATCH] --- MagickCore/magick-baseconfig.h | 8 +++++ MagickCore/version.h | 4 +-- coders/label.c | 9 ++---- config/config.h.in | 6 ++++ configure | 55 ++++++++++++++++++++++++++++++++-- configure.ac | 3 +- 6 files changed, 74 insertions(+), 11 deletions(-) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 6cc522e88..869931930 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -377,6 +377,9 @@ /* Define to 1 if you have the `gcov' library (-lgcov). */ /* #undef HAVE_LIBGCOV */ +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_LIMITS_H #define MAGICKCORE_HAVE_LIMITS_H 1 @@ -485,6 +488,11 @@ /* 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. */ +#ifndef MAGICKCORE_HAVE_NETINET_IN_H +#define MAGICKCORE_HAVE_NETINET_IN_H 1 +#endif + /* Define to 1 if you have the `newlocale' function. */ #ifndef MAGICKCORE_HAVE_NEWLOCALE #define MAGICKCORE_HAVE_NEWLOCALE 1 diff --git a/MagickCore/version.h b/MagickCore/version.h index f794b4566..bc8aad564 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 "10470:10476M" +#define MagickSVNRevision "10470:10492M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 8,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 8 #define MagickLibMinInterface 8 -#define MagickReleaseDate "2013-01-01" +#define MagickReleaseDate "2013-01-04" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "HDRI OpenMP" diff --git a/coders/label.c b/coders/label.c index b844f8681..e16ea94ff 100644 --- a/coders/label.c +++ b/coders/label.c @@ -150,8 +150,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, (void) status; width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); - if (((image->columns != 0) && (width > image->columns)) || - ((image->rows != 0) && (height > image->rows))) + if ((width > image->columns) && (height > image->rows)) break; draw_info->pointsize*=2.0; } @@ -167,8 +166,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); - if (((image->columns != 0) && (width <= image->columns)) || - ((image->rows != 0) && (height <= image->rows))) + if ((width <= image->columns) && (height <= image->rows)) low=draw_info->pointsize+1.0; else high=draw_info->pointsize-1.0; @@ -182,8 +180,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); - if (((image->columns != 0) && (width <= image->columns)) || - ((image->rows != 0) && (height <= image->rows))) + if ((width <= image->columns) && (height <= image->rows)) break; draw_info->pointsize--; } diff --git a/config/config.h.in b/config/config.h.in index 45d25095d..321bd7c7a 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -254,6 +254,9 @@ /* Define to 1 if you have the `gcov' library (-lgcov). */ #undef HAVE_LIBGCOV +/* Define to 1 if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -324,6 +327,9 @@ /* 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 + /* Define to 1 if you have the `newlocale' function. */ #undef HAVE_NEWLOCALE diff --git a/configure b/configure index 7066a68cf..11f718093 100755 --- a/configure +++ b/configure @@ -3650,7 +3650,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=10470:10476M +MAGICK_SVN_REVISION=10470:10492M @@ -21508,7 +21508,7 @@ fi # Check additional headers -for ac_header in arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h +for ac_header in arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -24789,6 +24789,57 @@ _ACEOF fi done +ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +if test "x$ac_cv_func_connect" = xyes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if ${ac_cv_lib_socket_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char connect (); +int +main () +{ +return connect (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes +else + ac_cv_lib_socket_connect=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSOCKET 1 +_ACEOF + + LIBS="-lsocket $LIBS" + +fi + +fi + # # Check for clock_gettime(). diff --git a/configure.ac b/configure.ac index 5a14fb79a..a047a7a3f 100755 --- a/configure.ac +++ b/configure.ac @@ -851,7 +851,7 @@ AC_HEADER_ASSERT AC_HEADER_DIRENT # Check additional headers -AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h) +AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h) ######## # @@ -1120,6 +1120,7 @@ LIBS="$MATH_LIBS $LIBS" AC_SUBST(MATH_LIBS) AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) +AC_CHECK_FUNC(connect,, AC_CHECK_LIB(socket, connect)) # # Check for clock_gettime(). -- 2.40.0