(no commit message)

diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
index 22236994465a9d5b336e1d07c0856f8c916ad968..2e2c89828b879f353731d1d1f00338b777b681fe 100644 (file)
--- a/PerlMagick/Makefile.PL.in
+++ b/PerlMagick/Makefile.PL.in
@@ -145,8 +145,11 @@ my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} @LDFLA
 my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} @LDFLAGS@";
 
 if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
-  # a special setup for strawberry perl
-  my ($Ipaths, $Lpaths) = AutodetectWin32gcc();
+  my($Ipaths, $Lpaths) = AutodetectWin32gcc();
+
+  #
+  # Setup for strawberry perl.
+  #
   $INC_magick       = "$Ipaths";
   $LIBS_magick      = "-lMagickCore";
   $CCFLAGS_magick   = "$Config{'ccflags'}";
@@ -164,7 +167,7 @@ WriteMakefile
    # Perl module name is Image::Magick
    'NAME'      => 'Image::Magick',
 
-    Module author
+   # Module author
    'AUTHOR' => 'ImageMagick Studio LLC',
 
    # Module version

diff --git a/coders/tiff.c b/coders/tiff.c
index cc83979d6a1918850bc2867a02d66de769b0457c..a19178a509e48447dce0c7cc0a20f3d6f8e9b8c5 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2529,27 +2529,15 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         break;
       }
     }
-#if defined(MAGICKCORE_HAVE_TIFFGETCONFIGUREDCODECS) || (TIFFLIB_VERSION > 20040919)
-    if (compress_tag != COMPRESSION_NONE)
+#if defined(MAGICKCORE_HAVE_TIFFISCODECCONFIGURED) || (TIFFLIB_VERSION > 20040919)
+    if ((compress_tag != COMPRESSION_NONE) &&
+        (TIFFIsCODECConfigured(compress_tag) == 0))
       {
-        TIFFCodec
-          *codec;
-
-        codec=TIFFGetConfiguredCODECs();
-        while ((codec != (TIFFCodec *) NULL) && (codec->name != (char *) NULL))
-        {
-          if (codec->scheme == compress_tag)
-            break;
-          codec++;
-        }
-        if (((codec == (TIFFCodec *) NULL)) || (codec->scheme != compress_tag))
-          {
-            (void) ThrowMagickException(&image->exception,GetMagickModule(),
-              CoderError,"CompressionNotSupported","`%s'",
-              MagickOptionToMnemonic(MagickCompressOptions,(long) compression));
-            compress_tag=COMPRESSION_NONE;
-            compression=NoCompression;
-          }
+        (void) ThrowMagickException(&image->exception,GetMagickModule(),
+          CoderError,"CompressionNotSupported","`%s'",MagickOptionToMnemonic(
+          MagickCompressOptions,(long) compression));
+        compress_tag=COMPRESSION_NONE;
+        compression=NoCompression;
       }
 #else
       switch (compress_tag)