Changeset 423

Timestamp:

10/21/09 06:12:00 (5 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• PerlMagick/Makefile.PL.in (modified) (2 diffs)
• coders/tiff.c (modified) (1 diff)

ImageMagick/trunk/PerlMagick/Makefile.PL.in

@@ -146 +146 @@
 
 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";
@@ -165 +168 @@
    'NAME'       => 'Image::Magick',
 
-    Module author
+   # Module author
    'AUTHOR' => 'ImageMagick Studio LLC',
 

ImageMagick/trunk/coders/tiff.c

@@ -2530 +2530 @@
       }
     }
-#if defined(MAGICKCORE_HAVE_TIFFGETCONFIGUREDCODECS) || (TIFFLIB_VERSION > 20040919)
-    if (compress_tag != COMPRESSION_NONE)
-      {
-        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;
-          }
+#if defined(MAGICKCORE_HAVE_TIFFISCODECCONFIGURED) || (TIFFLIB_VERSION > 20040919)
+    if ((compress_tag != COMPRESSION_NONE) &&
+        (TIFFIsCODECConfigured(compress_tag) == 0))
+      {
+        (void) ThrowMagickException(&image->exception,GetMagickModule(),
+          CoderError,"CompressionNotSupported","`%s'",MagickOptionToMnemonic(
+          MagickCompressOptions,(long) compression));
+        compress_tag=COMPRESSION_NONE;
+        compression=NoCompression;
       }
 #else