(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 6c325993c9a825b5159c2eef19e656e44d28648c..3db76f669fa1b245134c683f8140bc5fe0ec78a2 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1520,7 +1520,9 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have wmflite library */
-/* #undef WMFLITE_DELEGATE */
+#ifndef MAGICKCORE_WMFLITE_DELEGATE
+#define MAGICKCORE_WMFLITE_DELEGATE 1
+#endif
 
 /* Define if you have wmf library */
 /* #undef WMF_DELEGATE */

diff --git a/coders/tiff.c b/coders/tiff.c
index 612b1bdc90a128c8bddfef48ec0279416da5ea29..795a9754ff3bb8ee537b7422d4ab24eaa4d906b2 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1004,6 +1004,9 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     if (image->debug != MagickFalse)
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Image depth: %.20g",
         (double) image->depth);
+    image->endian=LSBEndian;
+    if (endian == FILLORDER_LSB2MSB)
+      image->endian=MSBEndian;
     if ((photometric == PHOTOMETRIC_MINISBLACK) ||
         (photometric == PHOTOMETRIC_MINISWHITE))
       image->colorspace=GRAYColorspace;
@@ -1112,10 +1115,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         TIFFClose(tiff);
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       }
-    quantum_info->endian=LSBEndian;
-    if (endian == FILLORDER_LSB2MSB)
-      quantum_info->endian=MSBEndian;
-    image->endian=quantum_info->endian;
     if (sample_format == SAMPLEFORMAT_UINT)
       status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat);
     if (sample_format == SAMPLEFORMAT_INT)
@@ -1226,6 +1225,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       method=ReadGenericMethod;
     if (TIFFIsTiled(tiff) != MagickFalse)
       method=ReadTileMethod;
+    quantum_info->endian=LSBEndian;
     quantum_type=RGBQuantum;
     pixels=GetQuantumPixels(quantum_info);
     switch (method)
@@ -2593,8 +2593,6 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
@@ -3142,9 +3140,6 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
     if (GetTIFFInfo(image_info,tiff,&tiff_info) == MagickFalse)
       ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
     quantum_info->endian=LSBEndian;
-    if (endian == FILLORDER_LSB2MSB)
-      quantum_info->endian=MSBEndian;
-    image->endian=quantum_info->endian;
     pixels=GetQuantumPixels(quantum_info);
     tiff_info.scanline=GetQuantumPixels(quantum_info);
     switch (photometric)

diff --git a/config/configure.xml b/config/configure.xml
index 930cfd811325386b441dccfeaa515ffe83a8526d..d38997a91996bd8bc0df3fd5738986036f832583 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -29,16 +29,16 @@
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib -L/usr/lib"/>
-  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -pthread -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -pthread -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-wmf=no --with-perl=no"/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
   <configure name="TARGET_CPU" value="x86_64"/>
   <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="DELEGATES" value="bzlib djvu fftw fontconfig freetype gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml zlib"/>
+  <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml wmf zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2012 ImageMagick Studio LLC"/>
   <configure name="WEBSITE" value="http://www.imagemagick.org"/>
   <configure name="QuantumDepth" value="16"/>

diff --git a/configure b/configure
index 96b5b258021e3d3b9ba74b0cfe120a7fefd205cc..1221c9e949df63a1d0fabb8ae519e5b44f8e1e22 100755 (executable)
--- a/configure
+++ b/configure
@@ -1919,7 +1919,7 @@ Optional Packages:
   --without-webp          disable WEBP support
   --with-windows-font-dir=DIR
                           directory containing MS-Windows fonts
-  --with-wmf              enable WMF support
+  --without-wmf           disable WMF support
   --without-xml           disable XML support
 
 Some influential environment variables:
@@ -31687,7 +31687,7 @@ fi
 if test "${with_wmf+set}" = set; then :
   withval=$with_wmf; with_wmf=$withval
 else
-  with_wmf='no'
+  with_wmf='yes'
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 93493deb19cc8b09edcf91397c182f8567f4b1ff..76ea66a114d4399c9a5e3bed196a575231bf5769 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2762,10 +2762,10 @@ dnl ===========================================================================
 # Check for WMF delegate library.
 #
 AC_ARG_WITH([wmf],
-    [AC_HELP_STRING([--with-wmf],
-                    [enable WMF support])],
+    [AC_HELP_STRING([--without-wmf],
+                    [disable WMF support])],
     [with_wmf=$withval],
-    [with_wmf='no'])
+    [with_wmf='yes'])
 
 if test "$with_wmf" != 'yes'; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-wmf=$with_wmf "