From: cristy Date: Sun, 12 Aug 2012 16:29:52 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5153 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=191c0b74324ab2ee84cf3c426285ecc07ef57394;p=imagemagick --- diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 7c2772fc3..66970d179 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -38,7 +38,7 @@ while test $# -gt 0; do 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 28674345c..cb18635e8 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 @@ MagickExport MagickBooleanType CompositeImage(Image *image, 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 9dccbcdf6..5885e55e3 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -1599,6 +1599,8 @@ MagickExport Image *EdgeImage(const Image *image,const double radius, } 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 8368f9364..8cf8e8989 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 ebc3b434f..fe95a1d1a 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -657,15 +657,11 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, 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 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) 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 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) } image_view=DestroyCacheView(image_view); return(status); +#endif } /* diff --git a/MagickCore/version.h b/MagickCore/version.h index 11fc31905..de3c608ca 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,15 +27,15 @@ extern "C" { */ #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 19e21b4ac..0c85a185b 100644 --- a/PerlMagick/t/filter.t +++ b/PerlMagick/t/filter.t @@ -120,7 +120,7 @@ testFilterCompare('input.miff', q//, 'reference/filter/MedianFilter.miff', 'Med 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/Raise.miff', 'Raise', q/ 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 73a302bfc..1775cee70 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-08-05 + 2012-08-12 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 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-08-05 + 2012-08-12 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index 110e6bc04..ea79605dc 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + @@ -37,7 +37,7 @@ - + diff --git a/configure b/configure index f14301454..db7700a70 100755 --- a/configure +++ b/configure @@ -1871,7 +1871,7 @@ Optional Features: --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_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=8850M +MAGICK_SVN_REVISION=8906:8907M @@ -21807,7 +21807,7 @@ fi 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 5d912c9a1..2f2ae8738 100755 --- a/configure.ac +++ b/configure.ac @@ -615,10 +615,10 @@ fi # 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 6147f1591..6d0cc3f53 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -28,6 +28,7 @@ Image Settings: \-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