From 944e51f85a37c221fa0ff079367e94358737ec3c Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 16 Apr 2013 18:45:02 +0000 Subject: [PATCH] --- MagickCore/magick-baseconfig.h | 5 +++++ MagickCore/version.h | 4 ++-- config/config.h.in | 3 +++ configure | 24 +++++++++++++++++++++++- configure.ac | 14 ++++++++++++++ utilities/convert.1 | 1 + utilities/mogrify.1 | 1 + 7 files changed, 49 insertions(+), 3 deletions(-) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 5a216221e..907114c2d 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -332,6 +332,11 @@ #define MAGICKCORE_HAVE_GMTIME_R 1 #endif +/* Compile with hugepage support */ +#ifndef MAGICKCORE_HAVE_HUGEPAGES +#define MAGICKCORE_HAVE_HUGEPAGES 1 +#endif + /* Define to 1 if the system has the type `intmax_t'. */ #ifndef MAGICKCORE_HAVE_INTMAX_T #define MAGICKCORE_HAVE_INTMAX_T 1 diff --git a/MagickCore/version.h b/MagickCore/version.h index 79c389e5b..bde489dd5 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 "11804:11823" +#define MagickSVNRevision "11838:11860M" #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-04-13" +#define MagickReleaseDate "2013-04-16" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/config/config.h.in b/config/config.h.in index b94f1673d..3cd092692 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -221,6 +221,9 @@ /* Define to 1 if you have the `gmtime_r' function. */ #undef HAVE_GMTIME_R +/* Compile with hugepage support */ +#undef HAVE_HUGEPAGES + /* Define to 1 if the system has the type `intmax_t'. */ #undef HAVE_INTMAX_T diff --git a/configure b/configure index 69bafabdd..eb5ead3d5 100755 --- a/configure +++ b/configure @@ -1134,6 +1134,7 @@ enable_zero_configuration enable_hdri enable_assert enable_maintainer_mode +enable_hugepages enable_ccmalloc enable_efence enable_prof @@ -1875,6 +1876,7 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --enable-hugepages enable 'huge pages' support --enable-ccmalloc enable 'ccmalloc' memory debug support --enable-efence enable 'efence' memory debug support --enable-prof enable 'prof' profiling support @@ -3675,7 +3677,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=11804:11823 +MAGICK_SVN_REVISION=11838:11860M # Substitute library versioning @@ -21055,6 +21057,15 @@ fi +# Enable hugepages support +# Check whether --enable-hugepages was given. +if test "${enable_hugepages+set}" = set; then : + enableval=$enable_hugepages; enable_hugepages=$enableval +else + enable_hugepages='no' +fi + + # Enable ccmalloc memory debugging support # Check whether --enable-ccmalloc was given. if test "${enable_ccmalloc+set}" = set; then : @@ -26818,6 +26829,17 @@ fi fi fi +# +# Add support for 'huge pages' if requested +# +if test "x$enable_hugepages" != "xno"; then : + + +$as_echo "#define HAVE_HUGEPAGES 1" >>confdefs.h + + +fi + # # Add support for efence memory debugging library if requested # diff --git a/configure.ac b/configure.ac index 990dddddb..ff69562ab 100755 --- a/configure.ac +++ b/configure.ac @@ -656,6 +656,13 @@ fi # Don't emit "rebuild rules" for configure, Makefile.ins, etc. AM_MAINTAINER_MODE +# Enable hugepages support +AC_ARG_ENABLE([hugepages], + [AC_HELP_STRING([--enable-hugepages], + [enable 'huge pages' support])], + [enable_hugepages=$enableval], + [enable_hugepages='no']) + # Enable ccmalloc memory debugging support AC_ARG_ENABLE([ccmalloc], [AC_HELP_STRING([--enable-ccmalloc], @@ -1439,6 +1446,13 @@ if test "$enable_ccmalloc" = 'yes'; then fi fi +# +# Add support for 'huge pages' if requested +# +AS_IF([test "x$enable_hugepages" != "xno"],[ + AC_DEFINE(HAVE_HUGEPAGES, 1, [Compile with hugepage support]) +]) + # # Add support for efence memory debugging library if requested # diff --git a/utilities/convert.1 b/utilities/convert.1 index 42eefeb0f..125971470 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -159,6 +159,7 @@ Image Operators: \-level value adjust the level of image contrast \-linear-stretch geometry improve contrast by `stretching with saturation' the intensity range + \-magnify double the size of the image with pixel art scaling \-median geometry apply a median filter to the image \-mode geometry make each pixel the 'predominant color' of the neighborhood \-modulate value vary the brightness, saturation, and hue diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index f3e1ac23d..04ba4434a 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -163,6 +163,7 @@ Image Operators: \-level value adjust the level of image contrast \-linear-stretch geometry improve contrast by `stretching with saturation' the intensity range + \-magnify double the size of the image with pixel art scaling \-median geometry apply a median filter to the image \-mode geometry make each pixel the 'predominant color' of the neighborhood \-modulate value vary the brightness, saturation, and hue -- 2.40.0