Mercurial > mxe-octave

changeset 3150:65fc638bdd8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 18 Jul 2013 11:34:31 -0400
parents 7bd867b6fc5b
children 2069703f3826
files src/msvc-graphicsmagick-1.patch
diffstat 1 files changed, 32 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/msvc-graphicsmagick-1.patch	Wed Jul 17 19:44:16 2013 -0400
+++ b/src/msvc-graphicsmagick-1.patch	Thu Jul 18 11:34:31 2013 -0400
@@ -1,6 +1,30 @@
+diff -ur GraphicsMagick-1.3.17-orig/Magick++/lib/Image.cpp GraphicsMagick-1.3.17/Magick++/lib/Image.cpp
+--- GraphicsMagick-1.3.17-orig/Magick++/lib/Image.cpp	2012-04-28 15:45:16 -0400
++++ GraphicsMagick-1.3.17/Magick++/lib/Image.cpp	2013-07-18 08:44:20 -0400
+@@ -2675,7 +2675,7 @@
+ }
+ 
+ // Image file size
+-off_t Magick::Image::fileSize ( void ) const
++MagickLib::magick_off_t Magick::Image::fileSize ( void ) const
+ {
+   return GetBlobSize( constImage() );
+ }
+diff -ur GraphicsMagick-1.3.17-orig/Magick++/lib/Magick++/Image.h GraphicsMagick-1.3.17/Magick++/lib/Magick++/Image.h
+--- GraphicsMagick-1.3.17-orig/Magick++/lib/Magick++/Image.h	2012-04-28 15:45:16 -0400
++++ GraphicsMagick-1.3.17/Magick++/lib/Magick++/Image.h	2013-07-18 08:44:35 -0400
+@@ -890,7 +890,7 @@
+     std::string     fileName ( void ) const;
+ 
+     // Number of bytes of the image on disk
+-    off_t          fileSize ( void ) const;
++    MagickLib::magick_off_t          fileSize ( void ) const;
+ 
+     // Color to use when filling drawn objects
+     void            fillColor ( const Color &fillColor_ );
 diff -ur GraphicsMagick-1.3.17-orig/Makefile.in GraphicsMagick-1.3.17/Makefile.in
 --- GraphicsMagick-1.3.17-orig/Makefile.in	2012-10-13 17:32:10 -0400
-+++ GraphicsMagick-1.3.17/Makefile.in	2013-06-27 20:05:41 -0400
++++ GraphicsMagick-1.3.17/Makefile.in	2013-07-18 08:43:30 -0400
 @@ -3399,7 +3399,7 @@
  @WITH_MODULES_TRUE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
  magick_libGraphicsMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
@@ -36,7 +60,7 @@
 +$(wand_libGraphicsMagickWand_la_OBJECTS): CPPFLAGS := $(CPPFLAGS) -D_WANDLIB_
 diff -ur GraphicsMagick-1.3.17-orig/coders/msl.c GraphicsMagick-1.3.17/coders/msl.c
 --- GraphicsMagick-1.3.17-orig/coders/msl.c	2012-10-13 17:30:21 -0400
-+++ GraphicsMagick-1.3.17/coders/msl.c	2013-06-27 15:34:28 -0400
++++ GraphicsMagick-1.3.17/coders/msl.c	2013-07-18 08:43:30 -0400
 @@ -63,8 +63,6 @@
  #if defined(MSWINDOWS)
  #  if defined(__MINGW32__)
@@ -48,7 +72,7 @@
  #include <libxml/parser.h>
 diff -ur GraphicsMagick-1.3.17-orig/coders/svg.c GraphicsMagick-1.3.17/coders/svg.c
 --- GraphicsMagick-1.3.17-orig/coders/svg.c	2012-10-13 17:30:21 -0400
-+++ GraphicsMagick-1.3.17/coders/svg.c	2013-06-27 15:34:47 -0400
++++ GraphicsMagick-1.3.17/coders/svg.c	2013-07-18 08:43:30 -0400
 @@ -50,8 +50,6 @@
  #  if defined(MSWINDOWS)
  #    if defined(__MINGW32__)
@@ -60,7 +84,7 @@
  #  include <libxml/parser.h>
 diff -ur GraphicsMagick-1.3.17-orig/coders/url.c GraphicsMagick-1.3.17/coders/url.c
 --- GraphicsMagick-1.3.17-orig/coders/url.c	2011-12-24 14:34:17 -0500
-+++ GraphicsMagick-1.3.17/coders/url.c	2013-06-27 15:35:06 -0400
++++ GraphicsMagick-1.3.17/coders/url.c	2013-07-18 08:43:30 -0400
 @@ -46,8 +46,6 @@
  #if defined(MSWINDOWS)
  #  if defined(__MINGW32__)
@@ -72,7 +96,7 @@
  #include <libxml/parser.h>
 diff -ur GraphicsMagick-1.3.17-orig/magick/common.h GraphicsMagick-1.3.17/magick/common.h
 --- GraphicsMagick-1.3.17-orig/magick/common.h	2012-10-13 17:30:22 -0400
-+++ GraphicsMagick-1.3.17/magick/common.h	2013-06-27 14:39:08 -0400
++++ GraphicsMagick-1.3.17/magick/common.h	2013-07-18 08:43:30 -0400
 @@ -10,6 +10,10 @@
  #ifndef _MAGICK_COMMON_H
  #define _MAGICK_COMMON_H
@@ -86,7 +110,7 @@
  #endif
 diff -ur GraphicsMagick-1.3.17-orig/magick/nt_base.c GraphicsMagick-1.3.17/magick/nt_base.c
 --- GraphicsMagick-1.3.17-orig/magick/nt_base.c	2011-12-24 14:34:17 -0500
-+++ GraphicsMagick-1.3.17/magick/nt_base.c	2013-06-27 15:30:20 -0400
++++ GraphicsMagick-1.3.17/magick/nt_base.c	2013-07-18 08:43:30 -0400
 @@ -67,6 +67,7 @@
    DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved);
  #endif
@@ -118,7 +142,7 @@
 +#endif
 diff -ur GraphicsMagick-1.3.17-orig/magick/static.c GraphicsMagick-1.3.17/magick/static.c
 --- GraphicsMagick-1.3.17-orig/magick/static.c	2012-10-13 17:30:22 -0400
-+++ GraphicsMagick-1.3.17/magick/static.c	2013-06-27 15:44:14 -0400
++++ GraphicsMagick-1.3.17/magick/static.c	2013-07-18 08:43:30 -0400
 @@ -255,9 +255,6 @@
    RegisterXCImage();
    RegisterXCFImage();
@@ -141,7 +165,7 @@
  #endif /* defined(HasX11) */
 diff -ur GraphicsMagick-1.3.17-orig/magick/studio.h GraphicsMagick-1.3.17/magick/studio.h
 --- GraphicsMagick-1.3.17-orig/magick/studio.h	2012-10-13 17:30:22 -0400
-+++ GraphicsMagick-1.3.17/magick/studio.h	2013-06-27 15:13:15 -0400
++++ GraphicsMagick-1.3.17/magick/studio.h	2013-07-18 08:43:30 -0400
 @@ -164,6 +164,10 @@
  #  include <pwd.h>
  #endif