diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 7c2772f..66970d1 100755
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -38,7 +38,7 @@
echo $exec_prefix
;;
--version)
- echo '7.0.0 Q16 '
+ echo '7.0.0 Q16 HDRI'
;;
--cflags)
pkg-config --cflags Magick++
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 2867434..cb18635 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -72,6 +72,7 @@
#include "MagickCore/resource_.h"
#include "MagickCore/string_.h"
#include "MagickCore/thread-private.h"
+#include "MagickCore/threshold.h"
#include "MagickCore/token.h"
#include "MagickCore/utility.h"
#include "MagickCore/utility-private.h"
@@ -2315,6 +2316,8 @@
destination_image=DestroyImage(destination_image);
else
composite_image=DestroyImage(composite_image);
+ if (status != MagickFalse)
+ (void) ClampImage(image,exception);
return(status);
}
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 9dccbcd..5885e55 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1599,6 +1599,8 @@
}
kernel_info->values[i/2]=(double) (width*width-1.0);
edge_image=ConvolveImage(image,kernel_info,exception);
+ if (edge_image != (Image *) NULL)
+ (void) ClampImage(edge_image,exception);
kernel_info=DestroyKernelInfo(kernel_info);
return(edge_image);
}
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 8368f93..8cf8e89 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1173,7 +1173,9 @@
#endif
/* accurately represent the wide range of intensity levels in real scenes */
-/* #undef HDRI_SUPPORT */
+#ifndef MAGICKCORE_HDRI_SUPPORT
+#define MAGICKCORE_HDRI_SUPPORT 1
+#endif
/* Define if you have umem memory allocation library */
/* #undef HasUMEM */
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index ebc3b43..fe95a1d 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -657,15 +657,11 @@
static inline Quantum ClampToUnsignedQuantum(const Quantum quantum)
{
-#if defined(MAGICKCORE_HDRI_SUPPORT)
if (quantum <= 0)
return(0);
if (quantum >= QuantumRange)
return(QuantumRange);
return(quantum);
-#else
- return(quantum);
-#endif
}
MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception)
@@ -684,6 +680,9 @@
ssize_t
y;
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ return(MagickTrue);
+#else
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
@@ -776,6 +775,7 @@
}
image_view=DestroyCacheView(image_view);
return(status);
+#endif
}
/*
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 11fc319..de3c608 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,15 +27,15 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision "8850M"
+#define MagickSVNRevision "8906:8907M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
-#define MagickReleaseDate "2012-08-05"
-#define MagickChangeDate "20110801"
+#define MagickReleaseDate "2012-08-12"
+#define MagickChangeDate "20120808"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOpenMPFeature "OpenMP "
diff --git a/PerlMagick/t/filter.t b/PerlMagick/t/filter.t
index 19e21b4..0c85a18 100644
--- a/PerlMagick/t/filter.t
+++ b/PerlMagick/t/filter.t
@@ -120,7 +120,7 @@
testFilterCompare('input.miff', q//, 'reference/filter/Minify.miff', 'Minify', q//, 0.00001, 0.004);
++$test;
-testFilterCompare('input.miff', q//, 'reference/filter/Modulate.miff', 'Modulate', q/brightness=>110,saturation=>110,hue=>110/, 0.00001, 0.004);
+testFilterCompare('input.miff', q//, 'reference/filter/Modulate.miff', 'Modulate', q/brightness=>110,saturation=>110,hue=>110/, 0.0006, 0.11);
++$test;
testFilterCompare('input.miff', q//, 'reference/filter/QuantizeMono.miff', 'Quantize', q/colors=>256/, 0.2, 0.7);
@@ -153,13 +153,13 @@
testFilterCompare('input.miff', q//, 'reference/filter/ReduceNoise.miff', 'ReduceNoise', q//, 0.0, 0.0);
++$test;
-testFilterCompare('input.miff', q//, 'reference/filter/Resize.miff', 'Resize', q/'60%'/, 0.00001, 0.004);
+testFilterCompare('input.miff', q//, 'reference/filter/Resize.miff', 'Resize', q/'60%'/, 0.00007, 0.07);
++$test;
testFilterCompare('input.miff', q//, 'reference/filter/Roll.miff', 'Roll', q/geometry=>'+20+10'/, 0.0, 0.0);
++$test;
-testFilterCompare('input.miff', q//, 'reference/filter/Rotate.miff', 'Rotate', q/45/, 0.0, 0.0);
+testFilterCompare('input.miff', q//, 'reference/filter/Rotate.miff', 'Rotate', q/45/, 0.00004, 0.04);
++$test;
testFilterCompare('input.miff', q//, 'reference/filter/Sample.miff', 'Sample', q/'60%'/, 0.0, 0.0);
diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 73a302b..1775cee 100644
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
<name>ImageMagick</name>
<shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
<homepage rdf:resource="http://www.imagemagick.org/"/>
- <created>2012-08-05</created>
+ <created>2012-08-12</created>
<description xml:lang="en">
ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@
<release>
<Version>
<name>stable</name>
- <created>2012-08-05</created>
+ <created>2012-08-12</created>
<revision>7.0.0</revision>
<patch-level>-0</patch-level>
</Version>
diff --git a/config/configure.xml b/config/configure.xml
index 110e6bc..ea79605 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
<configure name="VERSION" value="7.0.0"/>
<configure name="LIB_VERSION" value="0x700"/>
<configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
- <configure name="SVN_REVISION" value="8850M" />
- <configure name="RELEASE_DATE" value="2012-08-05"/>
+ <configure name="SVN_REVISION" value="8906:8907M" />
+ <configure name="RELEASE_DATE" value="2012-08-12"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
@@ -37,7 +37,7 @@
<configure name="TARGET_VENDOR" value="unknown"/>
<configure name="TARGET_OS" value="linux-gnu"/>
<configure name="HOST" value="x86_64-unknown-linux-gnu"/>
- <configure name="FEATURES" value="OpenMP "/>
+ <configure name="FEATURES" value="HDRI OpenMP "/>
<configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms2 lzma openexr pango png rsvg tiff x11 xml zlib"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2012 ImageMagick Studio LLC"/>
<configure name="WEBSITE" value="http://www.imagemagick.org"/>
diff --git a/configure b/configure
index f143014..db7700a 100755
--- a/configure
+++ b/configure
@@ -1871,7 +1871,7 @@
--enable-zero-configuration
enable self-contained, embeddable,
zero-configuration ImageMagick
- --enable-hdri accurately represent the wide range of intensity
+ --disable-hdri accurately represent the wide range of intensity
levels found in real scenes
--disable-assert disable assert() statements in build
--enable-maintainer-mode
@@ -3666,7 +3666,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=8850M
+MAGICK_SVN_REVISION=8906:8907M
@@ -21807,7 +21807,7 @@
if test "${enable_hdri+set}" = set; then :
enableval=$enable_hdri; enable_hdri=$enableval
else
- enable_hdri='no'
+ enable_hdri='yes'
fi
diff --git a/configure.ac b/configure.ac
index 5d912c9..2f2ae87 100755
--- a/configure.ac
+++ b/configure.ac
@@ -615,10 +615,10 @@
# Build a high dynamic range version of ImageMagick.
AC_ARG_ENABLE([hdri],
- [AC_HELP_STRING([--enable-hdri],
+ [AC_HELP_STRING([--disable-hdri],
[accurately represent the wide range of intensity levels found in real scenes])],
[enable_hdri=$enableval],
- [enable_hdri='no'])
+ [enable_hdri='yes'])
MAGICK_HDRI=""
if test "$enable_hdri" = 'yes'; then
diff --git a/utilities/identify.1 b/utilities/identify.1
index 6147f15..6d0cc3f 100644
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -28,6 +28,7 @@
\-limit type value pixel cache resource limit
\-list type Color, Configure, Delegate, Format, Magic, Module,
Resource, or Type
+ \-mask filename associate a mask with the image
\-matte store matte channel if the image has one
\-monitor monitor progress
\-ping efficiently determine image attributes