Mercurial > mxe-octave

comparison src/msvc-graphicsmagick-1.patch @ 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 728a29b93060
children
comparison
equal deleted inserted replaced
3149:7bd867b6fc5b 3150:65fc638bdd8e
1 diff -ur GraphicsMagick-1.3.17-orig/Magick++/lib/Image.cpp GraphicsMagick-1.3.17/Magick++/lib/Image.cpp
2 --- GraphicsMagick-1.3.17-orig/Magick++/lib/Image.cpp 2012-04-28 15:45:16 -0400
3 +++ GraphicsMagick-1.3.17/Magick++/lib/Image.cpp 2013-07-18 08:44:20 -0400
4 @@ -2675,7 +2675,7 @@
5 }
6
7 // Image file size
8 -off_t Magick::Image::fileSize ( void ) const
9 +MagickLib::magick_off_t Magick::Image::fileSize ( void ) const
10 {
11 return GetBlobSize( constImage() );
12 }
13 diff -ur GraphicsMagick-1.3.17-orig/Magick++/lib/Magick++/Image.h GraphicsMagick-1.3.17/Magick++/lib/Magick++/Image.h
14 --- GraphicsMagick-1.3.17-orig/Magick++/lib/Magick++/Image.h 2012-04-28 15:45:16 -0400
15 +++ GraphicsMagick-1.3.17/Magick++/lib/Magick++/Image.h 2013-07-18 08:44:35 -0400
16 @@ -890,7 +890,7 @@
17 std::string fileName ( void ) const;
18
19 // Number of bytes of the image on disk
20 - off_t fileSize ( void ) const;
21 + MagickLib::magick_off_t fileSize ( void ) const;
22
23 // Color to use when filling drawn objects
24 void fillColor ( const Color &fillColor_ );
1 diff -ur GraphicsMagick-1.3.17-orig/Makefile.in GraphicsMagick-1.3.17/Makefile.in 25 diff -ur GraphicsMagick-1.3.17-orig/Makefile.in GraphicsMagick-1.3.17/Makefile.in
2 --- GraphicsMagick-1.3.17-orig/Makefile.in 2012-10-13 17:32:10 -0400 26 --- GraphicsMagick-1.3.17-orig/Makefile.in 2012-10-13 17:32:10 -0400
3 +++ GraphicsMagick-1.3.17/Makefile.in 2013-06-27 20:05:41 -0400 27 +++ GraphicsMagick-1.3.17/Makefile.in 2013-07-18 08:43:30 -0400
4 @@ -3399,7 +3399,7 @@ 28 @@ -3399,7 +3399,7 @@
5 @WITH_MODULES_TRUE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL) 29 @WITH_MODULES_TRUE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
6 magick_libGraphicsMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS) 30 magick_libGraphicsMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
7 magick_libGraphicsMagick_la_LDFLAGS = \ 31 magick_libGraphicsMagick_la_LDFLAGS = \
8 - -no-undefined -export-symbols-regex ".*" \ 32 - -no-undefined -export-symbols-regex ".*" \
34 .NOEXPORT: 58 .NOEXPORT:
35 + 59 +
36 +$(wand_libGraphicsMagickWand_la_OBJECTS): CPPFLAGS := $(CPPFLAGS) -D_WANDLIB_ 60 +$(wand_libGraphicsMagickWand_la_OBJECTS): CPPFLAGS := $(CPPFLAGS) -D_WANDLIB_
37 diff -ur GraphicsMagick-1.3.17-orig/coders/msl.c GraphicsMagick-1.3.17/coders/msl.c 61 diff -ur GraphicsMagick-1.3.17-orig/coders/msl.c GraphicsMagick-1.3.17/coders/msl.c
38 --- GraphicsMagick-1.3.17-orig/coders/msl.c 2012-10-13 17:30:21 -0400 62 --- GraphicsMagick-1.3.17-orig/coders/msl.c 2012-10-13 17:30:21 -0400
39 +++ GraphicsMagick-1.3.17/coders/msl.c 2013-06-27 15:34:28 -0400 63 +++ GraphicsMagick-1.3.17/coders/msl.c 2013-07-18 08:43:30 -0400
40 @@ -63,8 +63,6 @@ 64 @@ -63,8 +63,6 @@
41 #if defined(MSWINDOWS) 65 #if defined(MSWINDOWS)
42 # if defined(__MINGW32__) 66 # if defined(__MINGW32__)
43 # define _MSC_VER 67 # define _MSC_VER
44 -# else 68 -# else
46 # endif 70 # endif
47 #endif 71 #endif
48 #include <libxml/parser.h> 72 #include <libxml/parser.h>
49 diff -ur GraphicsMagick-1.3.17-orig/coders/svg.c GraphicsMagick-1.3.17/coders/svg.c 73 diff -ur GraphicsMagick-1.3.17-orig/coders/svg.c GraphicsMagick-1.3.17/coders/svg.c
50 --- GraphicsMagick-1.3.17-orig/coders/svg.c 2012-10-13 17:30:21 -0400 74 --- GraphicsMagick-1.3.17-orig/coders/svg.c 2012-10-13 17:30:21 -0400
51 +++ GraphicsMagick-1.3.17/coders/svg.c 2013-06-27 15:34:47 -0400 75 +++ GraphicsMagick-1.3.17/coders/svg.c 2013-07-18 08:43:30 -0400
52 @@ -50,8 +50,6 @@ 76 @@ -50,8 +50,6 @@
53 # if defined(MSWINDOWS) 77 # if defined(MSWINDOWS)
54 # if defined(__MINGW32__) 78 # if defined(__MINGW32__)
55 # define _MSC_VER 79 # define _MSC_VER
56 -# else 80 -# else
58 # endif 82 # endif
59 # endif 83 # endif
60 # include <libxml/parser.h> 84 # include <libxml/parser.h>
61 diff -ur GraphicsMagick-1.3.17-orig/coders/url.c GraphicsMagick-1.3.17/coders/url.c 85 diff -ur GraphicsMagick-1.3.17-orig/coders/url.c GraphicsMagick-1.3.17/coders/url.c
62 --- GraphicsMagick-1.3.17-orig/coders/url.c 2011-12-24 14:34:17 -0500 86 --- GraphicsMagick-1.3.17-orig/coders/url.c 2011-12-24 14:34:17 -0500
63 +++ GraphicsMagick-1.3.17/coders/url.c 2013-06-27 15:35:06 -0400 87 +++ GraphicsMagick-1.3.17/coders/url.c 2013-07-18 08:43:30 -0400
64 @@ -46,8 +46,6 @@ 88 @@ -46,8 +46,6 @@
65 #if defined(MSWINDOWS) 89 #if defined(MSWINDOWS)
66 # if defined(__MINGW32__) 90 # if defined(__MINGW32__)
67 # define _MSC_VER 91 # define _MSC_VER
68 -# else 92 -# else
70 # endif 94 # endif
71 #endif 95 #endif
72 #include <libxml/parser.h> 96 #include <libxml/parser.h>
73 diff -ur GraphicsMagick-1.3.17-orig/magick/common.h GraphicsMagick-1.3.17/magick/common.h 97 diff -ur GraphicsMagick-1.3.17-orig/magick/common.h GraphicsMagick-1.3.17/magick/common.h
74 --- GraphicsMagick-1.3.17-orig/magick/common.h 2012-10-13 17:30:22 -0400 98 --- GraphicsMagick-1.3.17-orig/magick/common.h 2012-10-13 17:30:22 -0400
75 +++ GraphicsMagick-1.3.17/magick/common.h 2013-06-27 14:39:08 -0400 99 +++ GraphicsMagick-1.3.17/magick/common.h 2013-07-18 08:43:30 -0400
76 @@ -10,6 +10,10 @@ 100 @@ -10,6 +10,10 @@
77 #ifndef _MAGICK_COMMON_H 101 #ifndef _MAGICK_COMMON_H
78 #define _MAGICK_COMMON_H 102 #define _MAGICK_COMMON_H
79 103
80 +#ifdef _MSC_VER 104 +#ifdef _MSC_VER
84 #if defined(__cplusplus) || defined(c_plusplus) 108 #if defined(__cplusplus) || defined(c_plusplus)
85 extern "C" { 109 extern "C" {
86 #endif 110 #endif
87 diff -ur GraphicsMagick-1.3.17-orig/magick/nt_base.c GraphicsMagick-1.3.17/magick/nt_base.c 111 diff -ur GraphicsMagick-1.3.17-orig/magick/nt_base.c GraphicsMagick-1.3.17/magick/nt_base.c
88 --- GraphicsMagick-1.3.17-orig/magick/nt_base.c 2011-12-24 14:34:17 -0500 112 --- GraphicsMagick-1.3.17-orig/magick/nt_base.c 2011-12-24 14:34:17 -0500
89 +++ GraphicsMagick-1.3.17/magick/nt_base.c 2013-06-27 15:30:20 -0400 113 +++ GraphicsMagick-1.3.17/magick/nt_base.c 2013-07-18 08:43:30 -0400
90 @@ -67,6 +67,7 @@ 114 @@ -67,6 +67,7 @@
91 DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved); 115 DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved);
92 #endif 116 #endif
93 117
94 +#ifndef HAVE_DIRENT_H 118 +#ifndef HAVE_DIRENT_H
116 } 140 }
117 #endif 141 #endif
118 +#endif 142 +#endif
119 diff -ur GraphicsMagick-1.3.17-orig/magick/static.c GraphicsMagick-1.3.17/magick/static.c 143 diff -ur GraphicsMagick-1.3.17-orig/magick/static.c GraphicsMagick-1.3.17/magick/static.c
120 --- GraphicsMagick-1.3.17-orig/magick/static.c 2012-10-13 17:30:22 -0400 144 --- GraphicsMagick-1.3.17-orig/magick/static.c 2012-10-13 17:30:22 -0400
121 +++ GraphicsMagick-1.3.17/magick/static.c 2013-06-27 15:44:14 -0400 145 +++ GraphicsMagick-1.3.17/magick/static.c 2013-07-18 08:43:30 -0400
122 @@ -255,9 +255,6 @@ 146 @@ -255,9 +255,6 @@
123 RegisterXCImage(); 147 RegisterXCImage();
124 RegisterXCFImage(); 148 RegisterXCFImage();
125 RegisterXPMImage(); 149 RegisterXPMImage();
126 -#if defined(_VISUALC_) 150 -#if defined(_VISUALC_)
139 #if defined(HasX11) 163 #if defined(HasX11)
140 UnregisterXWDImage(); 164 UnregisterXWDImage();
141 #endif /* defined(HasX11) */ 165 #endif /* defined(HasX11) */
142 diff -ur GraphicsMagick-1.3.17-orig/magick/studio.h GraphicsMagick-1.3.17/magick/studio.h 166 diff -ur GraphicsMagick-1.3.17-orig/magick/studio.h GraphicsMagick-1.3.17/magick/studio.h
143 --- GraphicsMagick-1.3.17-orig/magick/studio.h 2012-10-13 17:30:22 -0400 167 --- GraphicsMagick-1.3.17-orig/magick/studio.h 2012-10-13 17:30:22 -0400
144 +++ GraphicsMagick-1.3.17/magick/studio.h 2013-06-27 15:13:15 -0400 168 +++ GraphicsMagick-1.3.17/magick/studio.h 2013-07-18 08:43:30 -0400
145 @@ -164,6 +164,10 @@ 169 @@ -164,6 +164,10 @@
146 # include <pwd.h> 170 # include <pwd.h>
147 #endif 171 #endif
148 172
149 +#if defined(_MSC_VER) && defined(HAVE_DIRENT_H) 173 +#if defined(_MSC_VER) && defined(HAVE_DIRENT_H)