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

…magick

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:
 

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.

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

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);
 }
-
+
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -679,7 +679,6 @@ MagickPrivate double NTErf(double x)
   return(sign*y);
 }
 
-
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -1750,15 +1749,19 @@ MagickPrivate DIR *NTOpenDirectory(const char *path)
     length;
 
   wchar_t
+    directory_separator[MagickPathExtent],
     file_specification[MagickPathExtent];
 
   assert(path != (const char *) NULL);
   length=MultiByteToWideChar(CP_UTF8,0,path,-1,file_specification,
     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)

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,

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

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='#'

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' )

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"