From: cristy Date: Wed, 18 May 2011 19:05:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7543 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8549b176173db7680652304c372c64bb1a51737;p=imagemagick --- diff --git a/config/config.h.in b/config/config.h.in index 8a24cf81a..73a093a92 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -354,6 +354,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 `newlocale' function. */ +#undef HAVE_NEWLOCALE + /* Define to 1 if you have the header file. */ #undef HAVE_OPENCL_CL_H @@ -679,6 +682,9 @@ /* Define to 1 if `vfork' works. */ #undef HAVE_WORKING_VFORK +/* Define to 1 if you have the header file. */ +#undef HAVE_XLOCALE_H + /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL diff --git a/config/configure.xml b/config/configure.xml index 8f50cf5c8..75f1630e9 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 63c58b36f..933914e14 100755 --- a/configure +++ b/configure @@ -3455,7 +3455,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=4443 +MAGICK_SVN_REVISION=4448 @@ -21563,7 +21563,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 stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.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 OS.h process.h stdarg.h sys/ipc.h sys/resource.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" @@ -24005,7 +24005,7 @@ fi LIBS="$MATH_LIBS $LIBS" -for ac_func in 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 j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep _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 strerror_r 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 usleep utime vsprintf vsnprintf waitpid _wfopen _wstat +for ac_func in 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 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 strerror_r 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 usleep utime vsprintf vsnprintf waitpid _wfopen _wstat do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 4f21516bd..3ae9394df 100755 --- a/configure.ac +++ b/configure.ac @@ -801,7 +801,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 stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.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 OS.h process.h stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h) ######## # @@ -1051,7 +1051,7 @@ AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,) LIBS="$MATH_LIBS $LIBS" AC_SUBST(MATH_LIBS) -AC_CHECK_FUNCS([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 j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep _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 strerror_r 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 usleep utime vsprintf vsnprintf waitpid _wfopen _wstat]) +AC_CHECK_FUNCS([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 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 strerror_r 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 usleep utime vsprintf vsnprintf waitpid _wfopen _wstat]) # # Check for clock_gettime(). diff --git a/magick/annotate.c b/magick/annotate.c index 6ea8fb14d..0d20d1c16 100644 --- a/magick/annotate.c +++ b/magick/annotate.c @@ -451,7 +451,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, undercolor_info->affine.tx=offset.x-draw_info->affine.ry*metrics.ascent; undercolor_info->affine.ty=offset.y-draw_info->affine.sy*metrics.ascent; (void) FormatMagickString(primitive,MaxTextExtent, - "rectangle 0.0 0.0 %g %.20g",metrics.origin.x,(double) height); + "rectangle 0,0 %g,%.20g",metrics.origin.x,(double) height); (void) CloneString(&undercolor_info->primitive,primitive); (void) DrawImage(image,undercolor_info); (void) DestroyDrawInfo(undercolor_info); @@ -459,7 +459,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, annotate_info->affine.tx=offset.x; annotate_info->affine.ty=offset.y; (void) FormatMagickString(primitive,MaxTextExtent,"stroke-width %g " - "line 0.0 0.0 %g 0.0",metrics.underline_thickness,metrics.width); + "line 0,0 %g,0",metrics.underline_thickness,metrics.width); if (annotate->decorate == OverlineDecoration) { annotate_info->affine.ty-=(draw_info->affine.sy*(metrics.ascent+ @@ -791,7 +791,7 @@ MagickExport MagickBooleanType GetTypeMetrics(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(AnnotateEvent,GetMagickModule(),"Metrics: text: %s; " "width: %g; height: %g; ascent: %g; descent: %g; max advance: %g; " - "bounds: %g %g %g %g; origin: %g %g; pixels per em: %g %g; " + "bounds: %g,%g %g,%g; origin: %g,%g; pixels per em: %g,%g; " "underline position: %g; underline thickness: %g",annotate_info->text, metrics->width,metrics->height,metrics->ascent,metrics->descent, metrics->max_advance,metrics->bounds.x1,metrics->bounds.y1, @@ -951,7 +951,7 @@ static int TraceCubicBezier(FT_Vector *p,FT_Vector *q,FT_Vector *to, affine=draw_info->affine; (void) FormatMagickString(path,MaxTextExtent, - "C%g %g %g %g %g %g",affine.tx+p->x/64.0,affine.ty- + "C%g,%g %g,%g %g,%g",affine.tx+p->x/64.0,affine.ty- p->y/64.0,affine.tx+q->x/64.0,affine.ty-q->y/64.0,affine.tx+to->x/64.0, affine.ty-to->y/64.0); (void) ConcatenateString(&draw_info->primitive,path); @@ -967,7 +967,7 @@ static int TraceLineTo(FT_Vector *to,DrawInfo *draw_info) path[MaxTextExtent]; affine=draw_info->affine; - (void) FormatMagickString(path,MaxTextExtent,"L%g %g",affine.tx+ + (void) FormatMagickString(path,MaxTextExtent,"L%g,%g",affine.tx+ to->x/64.0,affine.ty-to->y/64.0); (void) ConcatenateString(&draw_info->primitive,path); return(0); @@ -982,7 +982,7 @@ static int TraceMoveTo(FT_Vector *to,DrawInfo *draw_info) path[MaxTextExtent]; affine=draw_info->affine; - (void) FormatMagickString(path,MaxTextExtent,"M%g %g",affine.tx+ + (void) FormatMagickString(path,MaxTextExtent,"M%g,%g",affine.tx+ to->x/64.0,affine.ty-to->y/64.0); (void) ConcatenateString(&draw_info->primitive,path); return(0); @@ -998,7 +998,7 @@ static int TraceQuadraticBezier(FT_Vector *control,FT_Vector *to, path[MaxTextExtent]; affine=draw_info->affine; - (void) FormatMagickString(path,MaxTextExtent,"Q%g %g %g %g", + (void) FormatMagickString(path,MaxTextExtent,"Q%g,%g %g,%g", affine.tx+control->x/64.0,affine.ty-control->y/64.0,affine.tx+to->x/64.0, affine.ty-to->y/64.0); (void) ConcatenateString(&draw_info->primitive,path); diff --git a/magick/magick-config.h b/magick/magick-config.h index 2ebc4e37f..43755b363 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -529,6 +529,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 `newlocale' function. */ +#ifndef MAGICKCORE_HAVE_NEWLOCALE +#define MAGICKCORE_HAVE_NEWLOCALE 1 +#endif + /* Define to 1 if you have the header file. */ /* #undef HAVE_OPENCL_CL_H */ @@ -1038,6 +1043,11 @@ #define MAGICKCORE_HAVE_WORKING_VFORK 1 #endif +/* Define to 1 if you have the header file. */ +#ifndef MAGICKCORE_HAVE_XLOCALE_H +#define MAGICKCORE_HAVE_XLOCALE_H 1 +#endif + /* Define to 1 if the system has the type `_Bool'. */ #ifndef MAGICKCORE_HAVE__BOOL #define MAGICKCORE_HAVE__BOOL 1 diff --git a/magick/version.h b/magick/version.h index b30f96844..e359ded5c 100644 --- a/magick/version.h +++ b/magick/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "4443" +#define MagickSVNRevision "4448" #define MagickLibVersion 0x669 #define MagickLibVersionText "6.6.9" #define MagickLibVersionNumber 4,0,1 #define MagickLibAddendum "-10" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-05-16" +#define MagickReleaseDate "2011-05-18" #define MagickChangeDate "20110516" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT)