(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 5a216221e3f8ed0094cec92af448e44fdb9412e8..907114c2d7e90f028df81fc6a88b727fb0bfdb5b 100644 (file)
--- 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 79c389e5b46549570f1cf051eeda0d43599bfb77..bde489dd549efd6ec19b34441d0b2c76299986ce 100644 (file)
--- 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 b94f1673d1b4b9a3f1e4bb51906a6b826c60cbff..3cd092692135508b643e2a5ffd0a0484354b8089 100644 (file)
--- 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 69bafabdd463e7a2a55fcc54964ee19cb59624c7..eb5ead3d581c8f55f521b1212fdde309083b5a89 100755 (executable)
--- 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 990dddddb7d19398aca67c3261fb2e2654019721..ff69562abc47482a6914527bbbe94a480b1d7a2b 100755 (executable)
--- 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 42eefeb0fe8d59b145883e723b3b5197f0ba10d8..1259714709fb222413124f5d1c76813026c2973f 100644 (file)
--- 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 f3e1ac23d46bd3ae04b9c61deedf15266f7d1f3c..04ba4434a0ade3aae1f182223a392b0c6dc7ebb6 100644 (file)
--- 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