(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 6183307cc105e6cb5f171b25c5f9b0dc0c172ae2..39df52a3a79130c6cf40af3d24062961b795f200 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -145,7 +145,7 @@ cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{VERSION}
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # fix weird perl Magick.so permissions
-chmod -f 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so
+chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so
 
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index e4922bd87ea73d13ac0d97d59a28a4c033a2dbbf..00ef9b91436105c19fdfb22397be60df5db06fa7 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -145,7 +145,7 @@ cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{VERSION}
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # fix weird perl Magick.so permissions
-chmod -f 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so
+chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so
 
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl

diff --git a/Magick++/demo/shapes.cpp b/Magick++/demo/shapes.cpp
index f2c9616815806a60723fc1cff1b9b931be3338e8..8ad5848177de7c76eaa636b7205b23087ef7c4bb 100644 (file)
--- a/Magick++/demo/shapes.cpp
+++ b/Magick++/demo/shapes.cpp
@@ -76,7 +76,7 @@ int main( int /*argc*/, char ** argv)
     //
     // Floodfill object with blue
     //
-    image.colorFuzz( 80 );
+    image.colorFuzz( 0.8*QuantumRange );
     image.floodFillColor( "+132+62", "blue" );
 
     //

diff --git a/Makefile.am b/Makefile.am
index 263215604819d295c5914ed9dc1b7ce63aa3a255..251825981d275fd94075aa51274c7dedd28a51e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ TEST_EXTENSIONS = .sh
 
 # Tests to run
 TESTS = \
+  $(PERLMAGICK_TESTS) \
        $(TESTS_TESTS) \
        $(MAGICKPP_TESTS) \
        $(WAND_TESTS) \

diff --git a/Makefile.in b/Makefile.in
index 9448a0babaa01cf47d6b94c9462c7eafe61970b8..bef64ced0bee3819cf730527ee53979b2e956076 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -215,7 +215,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(TESTS_TESTS) $(am__EXEEXT_6) $(WAND_TESTS)
+TESTS = $(PERLMAGICK_TESTS) $(TESTS_TESTS) $(am__EXEEXT_6) \
+       $(WAND_TESTS)
 XFAIL_TESTS = $(am__EXEEXT_7) $(am__EXEEXT_7)
 check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_5)
 DIST_COMMON = $(am__configure_deps) $(am__include_HEADERS_DIST) \
@@ -4527,7 +4528,9 @@ TESTS_CLEANFILES =
 @WITH_PERL_TRUE@PERLMAKEMAKER = $(PERLMAGICK)/Makefile.PL
 @WITH_PERL_TRUE@PERLMAKEFILE = $(PERLMAGICK)/Makefile
 @WITH_PERL_TRUE@PERLMAGICK_ALL_LOCAL_TARGETS = all-perl
+@WITH_PERL_TRUE@PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS = install-exec-perl
 @WITH_PERL_TRUE@PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS = 
+@WITH_PERL_TRUE@PERLMAGICK_UNINSTALL_LOCAL_TARGETS = uninstall-exec-perl
 @WITH_PERL_TRUE@PERLMAGICK_CLEAN_LOCAL_TARGETS = clean-perl
 @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
 @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local

diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am
index 5eaf26e6c670401ce133edd6871e455aabb9b0f3..20aafb3a3667421fe18103631b7f8678f357ff28 100644 (file)
--- a/PerlMagick/Makefile.am
+++ b/PerlMagick/Makefile.am
@@ -33,7 +33,9 @@ PERLMAKEMAKER=$(PERLMAGICK)/Makefile.PL
 PERLMAKEFILE=$(PERLMAGICK)/Makefile
 
 PERLMAGICK_ALL_LOCAL_TARGETS = all-perl
+PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS = install-exec-perl
 PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS = 
+PERLMAGICK_UNINSTALL_LOCAL_TARGETS = uninstall-exec-perl
 PERLMAGICK_CLEAN_LOCAL_TARGETS = clean-perl
 PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
 PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local

diff --git a/coders/jpeg.c b/coders/jpeg.c
index dff4ce538a039e0b88714bda788d9d7662f13156..384629af67defdd1056ba6523517dfa7ef66c83c 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -731,17 +731,12 @@ static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info,
          {
            if ((qvalue < hash[i]) && (sum < sums[i]))
              continue;
-           if ((qvalue <= hash[i]) && (sum <= sums[i]))
+           if (((qvalue <= hash[i]) && (sum <= sums[i])) || (i >= 50))
              image->quality=(unsigned long) i+1;
            if (image->debug != MagickFalse)
-             {
-               if (image->quality != UndefinedCompressionQuality)
-                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                   "Quality: %ld",image->quality);
-               else
-                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                   "Quality: %ld (approximate)",i+1);
-             }
+             (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+               "Quality: %ld (%s)",i+1,(qvalue <= hash[i]) &&
+               (sum <= sums[i]) ? "exact" : "approximate");
            break;
          }
        }
@@ -785,16 +780,12 @@ static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info,
            {
              if ((qvalue < hash[i]) && (sum < sums[i]))
                continue;
-             image->quality=(unsigned long) i+1;
+             if (((qvalue <= hash[i]) && (sum <= sums[i])) || (i >= 50))
+               image->quality=(unsigned long) i+1;
              if (image->debug != MagickFalse)
-               {
-                 if ((qvalue > hash[i]) || (sum > sums[i]))
-                   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                     "Quality: %ld (approximate)",i+1);
-                 else
-                   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                     "Quality: %ld",i+1);
-               }
+               (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                 "Quality: %ld (%s)",i+1,(qvalue <= hash[i]) &&
+                 (sum <= sums[i]) ? "exact" : "approximate");
              break;
            }
          }

diff --git a/config/configure.xml b/config/configure.xml
index d7822092d3210f281544610d22ecc437df2f2be2..abbbd6db5d61303ee242fe57b8ed0132b7d1bb8a 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x659"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,9,0"/>
-  <configure name="RELEASE_DATE" value="2010-01-12"/>
+  <configure name="RELEASE_DATE" value="2010-01-13"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/version.h b/magick/version.h
index 1ce156d454d4e97d0b8310fa2d29a97ae1038c32..f5157824f42c1a7aff0ca5eda91282f5eca8e3be 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -32,7 +32,7 @@ extern "C" {
 #define MagickLibVersionNumber  3,0,0
 #define MagickLibSubversion  "-0"
 #define MagickLibInterface  3
-#define MagickReleaseDate  "2010-01-12"
+#define MagickReleaseDate  "2010-01-13"
 #define MagickChangeDate   "20100101"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.9/index.html"