https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-imagemagick

diff --git a/Install-mac.txt b/Install-mac.txt
index 0e47a3e6a53f400d790fe5917bc576eb8df7c70d..7dbf824458ba966ed37ed4af0349ffda44cd5fd9 100644 (file)
--- a/Install-mac.txt
+++ b/Install-mac.txt
@@ -75,8 +75,8 @@ against its message digest.
   
 Unpack and change into the top-level ImageMagick directory:
   
-    $magick> tar xvfz ImageMagick-6.5.9-0.tar.gz 
-    $magick> cd ImageMagick-6.5.9
+    $magick> tar xvfz ImageMagick-7.0.3-0.tar.gz 
+    $magick> cd ImageMagick-7.0.3
   
 Configure ImageMagick:
   

diff --git a/Install-windows.txt b/Install-windows.txt
index 594f5a093af556106622b529f3f1587539af9053..4699e4b175e064baf16c0fc0d60720e952b54a82 100644 (file)
--- a/Install-windows.txt
+++ b/Install-windows.txt
@@ -291,7 +291,7 @@ Install
   To get started building a self-installing ImageMagick executable, go to
   VisualMagick\installer folder and click on a script that matches your build
   environment. Press F9 to build and install ImageMagick. The default location
-  is C:Program Files\ImageMagick-6.?.?\Q?. The exact folder name depends
+  is C:Program Files\ImageMagick-7.?.?\Q?. The exact folder name depends
   on the ImageMagick version and quantum depth. Once installed, ImageMagick
   command line utilities and libraries are available to the MS Command Prompt,
   web scripts, or to meet your development needs.

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 0103ccf8824bd76610e5a75c5140bfe3276d4463..5d16deb33c4355ba5e2eeeba182536c65a296c48 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -142,7 +142,7 @@ extern "C" {
 #  define MAGICKCORE_PATH_SEPARATOR            ":"
 #endif /* !DIR_SEPARATOR_CHAR */
 
-# if defined(MAGICKCORE_POSIX_SUPPORT)
+# if defined(MAGICKCORE_POSIX_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
  
 /* module dir */
 #ifndef MAGICKCORE_MODULES_DIRNAME

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 16089762277e489ca8deaefd49c1aec43af37ed1..17652b7efbef60ea932e1d9bce541d6b2578afc3 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -626,7 +626,7 @@ MagickPrivate double NTElapsedTime(void)
   SystemTimeToFileTime(&system_time,&elapsed_time.filetime);
   return((double) 1.0e-7*elapsed_time.filetime64);
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -679,7 +679,6 @@ MagickPrivate double NTErf(double x)
   return(sign*y);
 }
 \f
-\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -1750,6 +1749,7 @@ MagickPrivate DIR *NTOpenDirectory(const char *path)
     length;
 
   wchar_t
+    directory_separator[MagickPathExtent],
     file_specification[MagickPathExtent];
 
   assert(path != (const char *) NULL);
@@ -1757,8 +1757,11 @@ MagickPrivate DIR *NTOpenDirectory(const char *path)
     MagickPathExtent);
   if (length == 0)
     return((DIR *) NULL);
-  if(wcsncat(file_specification,(const wchar_t*) DirectorySeparator,
-       MagickPathExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
+  length=MultiByteToWideChar(CP_UTF8,0,DirectorySeparator,-1,
+    directory_separator,strlen(DirectorySeparator)+1);
+  if (length == 0)
+    return((DIR *) NULL);
+  if (wcsncat(file_specification,directory_separator,MagickPathExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
     return((DIR *) NULL);
   entry=(DIR *) AcquireMagickMemory(sizeof(DIR));
   if (entry != (DIR *) NULL)

diff --git a/Makefile.in b/Makefile.in
index 31eabb8b3bed98ad01efc3f1797e2ca19bdcc332..882ce5bb0660f8c201910ac2a71d94972e7fa3d9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -55,7 +55,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -71,7 +71,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -87,7 +87,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -104,7 +104,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -129,7 +129,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -145,7 +145,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -161,7 +161,7 @@
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    https://www.imagemagick.org/script/license.php
+#    http://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -1761,7 +1761,7 @@ coders_xps_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_xps_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_xps_la_rpath = -rpath $(codersdir)
-coders_xtrn_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_xtrn_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
 am_coders_xtrn_la_OBJECTS = coders/coders_xtrn_la-xtrn.lo
 coders_xtrn_la_OBJECTS = $(am_coders_xtrn_la_OBJECTS)
 coders_xtrn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -2693,6 +2693,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OLE_LIBS = @OLE_LIBS@
 OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
 OPENEXR_LIBS = @OPENEXR_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
@@ -4081,7 +4082,7 @@ coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MUPDF_LIBS) $(FREETYPE_LIBS) $(MATH_
 coders_xtrn_la_SOURCES = coders/xtrn.c
 coders_xtrn_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
 coders_xtrn_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_xtrn_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_xtrn_la_LIBADD = $(MAGICKCORE_LIBS) $(OLE_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES = coders/xwd.c
@@ -4988,7 +4989,7 @@ UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities
 # You may not use this file except in compliance with the License.
 # obtain a copy of the License at
 #
-#   https://www.imagemagick.org/script/license.php
+#   http://www.imagemagick.org/script/license.php
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 62ee2035c030906b161d8c78c2b171031e9c7a6c..4f315bacc6b2ef1855db43ac24b36e41fd5523ca 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -1083,7 +1083,7 @@ coders_xps_la_LIBADD       = $(MAGICKCORE_LIBS) $(MUPDF_LIBS) $(FREETYPE_LIBS) $
 coders_xtrn_la_SOURCES     = coders/xtrn.c
 coders_xtrn_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
 coders_xtrn_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_xtrn_la_LIBADD      = $(MAGICKCORE_LIBS)
+coders_xtrn_la_LIBADD      = $(MAGICKCORE_LIBS) $(OLE_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES      = coders/xwd.c

diff --git a/configure b/configure
index 26530e4d2f5fba5d2309d8e14541c6a2a4a99f88..a46467cd169653be336fa7b19b8928a3dc440bbd 100755 (executable)
--- a/configure
+++ b/configure
@@ -958,6 +958,7 @@ WIN32_NATIVE_BUILD_FALSE
 WIN32_NATIVE_BUILD_TRUE
 WINGDI32_DELEGATE_FALSE
 WINGDI32_DELEGATE_TRUE
+OLE_LIBS
 GDI32_LIBS
 HAVE_LD_VERSION_SCRIPT_FALSE
 HAVE_LD_VERSION_SCRIPT_TRUE
@@ -4517,7 +4518,7 @@ MAGICK_PATCHLEVEL_VERSION=6
 
 MAGICK_VERSION=7.0.3-6
 
-MAGICK_GIT_REVISION=18977:5b34848:20161031
+MAGICK_GIT_REVISION=19000:507a75a:20161108
 
 
 # Substitute library versioning
@@ -10978,6 +10979,7 @@ case "${host_os}" in
     mingw* )
         native_win32_build='yes'
         GDI32_LIBS='-lgdi32'
+        OLE_LIBS='-loleaut32'
     ;;
 esac
 if test "${GDI32_LIBS}x" != 'x'; then
@@ -10986,6 +10988,7 @@ $as_echo "#define WINGDI32_DELEGATE 1" >>confdefs.h
 
 fi
 
+
  if test "${GDI32_LIBS}x" != 'x' ; then
   WINGDI32_DELEGATE_TRUE=
   WINGDI32_DELEGATE_FALSE='#'

diff --git a/configure.ac b/configure.ac
index f96eae24b2ef77f099812b757555d69d92aa1d08..11d3b156a0467ccc922c822a1ae7929e0e85b42b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -356,12 +356,14 @@ case "${host_os}" in
     mingw* )
         native_win32_build='yes'
         GDI32_LIBS='-lgdi32'
+        OLE_LIBS='-loleaut32'
     ;;
 esac
 if test "${GDI32_LIBS}x" != 'x'; then
     AC_DEFINE(WINGDI32_DELEGATE,1,Define to use the Windows GDI32 library)
 fi
 AC_SUBST(GDI32_LIBS)
+AC_SUBST(OLE_LIBS)
 AM_CONDITIONAL(WINGDI32_DELEGATE, test "${GDI32_LIBS}x" != 'x' )
 AM_CONDITIONAL(WIN32_NATIVE_BUILD, test "${native_win32_build}" = 'yes' )
 AM_CONDITIONAL(CYGWIN_BUILD, test "${cygwin_build}" = 'yes' )

diff --git a/winpath.sh b/winpath.sh
index 488c268e19413eeef4aaace83b19d51b61a09886..b881b378156ba0f1bbf345f30dd938f6e9269355 100755 (executable)
--- a/winpath.sh
+++ b/winpath.sh
@@ -36,7 +36,7 @@ mount | sed -e 's:\\:/:g'  | (
   do
     win_mount_path=`echo "$mount_entry" | sed -e 's: .*::g'`
     unix_mount_path=`echo "$mount_entry" | sed -e 's:.* on ::;s: type .*::'`
-    temp=`echo "$arg" | sed -e "s!^$unix_mount_path!$win_mount_path!"`
+    temp=`echo "$arg" | sed -e "s!^$unix_mount_path!$win_mount_path/!"`
     if test "$temp" != "$arg"
     then
       candidate="$temp"