Mercurial > mxe-octave
annotate src/msvc-graphicsmagick-1.patch @ 4662:b77b935415aa
of-windows: update to v1.3.0
* build_packages.m: update windows verseion
* dist-files.mk: removed ref to of-windows-1-fixes.patch
* src/of-windows.mk: update version, checksum, remove bootstrap call
* src/of-windows-1-fixes.patch: removed file
author | John Donoghue |
---|---|
date | Tue, 17 Apr 2018 12:22:53 -0400 |
parents | 65fc638bdd8e |
children |
rev | line source |
---|---|
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
1 diff -ur GraphicsMagick-1.3.17-orig/Magick++/lib/Image.cpp GraphicsMagick-1.3.17/Magick++/lib/Image.cpp |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
2 --- GraphicsMagick-1.3.17-orig/Magick++/lib/Image.cpp 2012-04-28 15:45:16 -0400 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
3 +++ GraphicsMagick-1.3.17/Magick++/lib/Image.cpp 2013-07-18 08:44:20 -0400 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
4 @@ -2675,7 +2675,7 @@ |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
5 } |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
6 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
7 // Image file size |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
8 -off_t Magick::Image::fileSize ( void ) const |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
9 +MagickLib::magick_off_t Magick::Image::fileSize ( void ) const |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
10 { |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
11 return GetBlobSize( constImage() ); |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
12 } |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
13 diff -ur GraphicsMagick-1.3.17-orig/Magick++/lib/Magick++/Image.h GraphicsMagick-1.3.17/Magick++/lib/Magick++/Image.h |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
14 --- GraphicsMagick-1.3.17-orig/Magick++/lib/Magick++/Image.h 2012-04-28 15:45:16 -0400 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
15 +++ GraphicsMagick-1.3.17/Magick++/lib/Magick++/Image.h 2013-07-18 08:44:35 -0400 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
16 @@ -890,7 +890,7 @@ |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
17 std::string fileName ( void ) const; |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
18 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
19 // Number of bytes of the image on disk |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
20 - off_t fileSize ( void ) const; |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
21 + MagickLib::magick_off_t fileSize ( void ) const; |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
22 |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
23 // Color to use when filling drawn objects |
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
24 void fillColor ( const Color &fillColor_ ); |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 diff -ur GraphicsMagick-1.3.17-orig/Makefile.in GraphicsMagick-1.3.17/Makefile.in |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 --- GraphicsMagick-1.3.17-orig/Makefile.in 2012-10-13 17:32:10 -0400 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
27 +++ GraphicsMagick-1.3.17/Makefile.in 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 @@ -3399,7 +3399,7 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 @WITH_MODULES_TRUE@magick_libGraphicsMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 magick_libGraphicsMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 magick_libGraphicsMagick_la_LDFLAGS = \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 - -no-undefined -export-symbols-regex ".*" \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 + -no-undefined -export-symbols-regex "xXx" \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 $(MAGICK_LT_RELEASE_OPTS) \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 -version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 @@ -3811,7 +3811,7 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 # -no-undefined -export-symbols-regex ".*" |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 Magick___lib_libGraphicsMagick___la_LDFLAGS = -no-undefined \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 - $(MAGICK_LT_RELEASE_OPTS) \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 + $(MAGICK_LT_RELEASE_OPTS) -export-symbols-regex "xXx" \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 -version-info $(MAGICK_PLUS_PLUS_LIBRARY_CURRENT):$(MAGICK_PLUS_PLUS_LIBRARY_REVISION):$(MAGICK_PLUS_PLUS_LIBRARY_AGE) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 Magick___lib_libGraphicsMagick___la_LIBADD = $(LIBMAGICK) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 @@ -3967,7 +3967,7 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 LIBWAND = wand/libGraphicsMagickWand.la |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 wand_libGraphicsMagickWand_la_SOURCES = $(WAND_SOURCES) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 -wand_libGraphicsMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 +wand_libGraphicsMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex "xXx" \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 $(MAGICK_LT_RELEASE_OPTS) \ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 -version-info $(MAGICK_WAND_LIBRARY_CURRENT):$(MAGICK_WAND_LIBRARY_REVISION):$(MAGICK_WAND_LIBRARY_AGE) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 @@ -9764,3 +9764,5 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 # Tell versions [3.59,3.63) of GNU make to not export all variables. |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 # Otherwise a system limit (for SysV at least) may be exceeded. |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 .NOEXPORT: |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 + |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 +$(wand_libGraphicsMagickWand_la_OBJECTS): CPPFLAGS := $(CPPFLAGS) -D_WANDLIB_ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 diff -ur GraphicsMagick-1.3.17-orig/coders/msl.c GraphicsMagick-1.3.17/coders/msl.c |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 --- GraphicsMagick-1.3.17-orig/coders/msl.c 2012-10-13 17:30:21 -0400 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
63 +++ GraphicsMagick-1.3.17/coders/msl.c 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 @@ -63,8 +63,6 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
65 #if defined(MSWINDOWS) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 # if defined(__MINGW32__) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 # define _MSC_VER |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 -# else |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 -# include <win32config.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 # endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 #endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 #include <libxml/parser.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
73 diff -ur GraphicsMagick-1.3.17-orig/coders/svg.c GraphicsMagick-1.3.17/coders/svg.c |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
74 --- GraphicsMagick-1.3.17-orig/coders/svg.c 2012-10-13 17:30:21 -0400 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
75 +++ GraphicsMagick-1.3.17/coders/svg.c 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
76 @@ -50,8 +50,6 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
77 # if defined(MSWINDOWS) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
78 # if defined(__MINGW32__) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
79 # define _MSC_VER |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
80 -# else |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
81 -# include <win32config.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
82 # endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
83 # endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
84 # include <libxml/parser.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
85 diff -ur GraphicsMagick-1.3.17-orig/coders/url.c GraphicsMagick-1.3.17/coders/url.c |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
86 --- GraphicsMagick-1.3.17-orig/coders/url.c 2011-12-24 14:34:17 -0500 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
87 +++ GraphicsMagick-1.3.17/coders/url.c 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
88 @@ -46,8 +46,6 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
89 #if defined(MSWINDOWS) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
90 # if defined(__MINGW32__) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
91 # define _MSC_VER |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
92 -# else |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
93 -# include <win32config.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
94 # endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
95 #endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
96 #include <libxml/parser.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
97 diff -ur GraphicsMagick-1.3.17-orig/magick/common.h GraphicsMagick-1.3.17/magick/common.h |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
98 --- GraphicsMagick-1.3.17-orig/magick/common.h 2012-10-13 17:30:22 -0400 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
99 +++ GraphicsMagick-1.3.17/magick/common.h 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
100 @@ -10,6 +10,10 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
101 #ifndef _MAGICK_COMMON_H |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
102 #define _MAGICK_COMMON_H |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
103 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
104 +#ifdef _MSC_VER |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
105 +# define _VISUALC_ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
106 +#endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
107 + |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
108 #if defined(__cplusplus) || defined(c_plusplus) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
109 extern "C" { |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
110 #endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
111 diff -ur GraphicsMagick-1.3.17-orig/magick/nt_base.c GraphicsMagick-1.3.17/magick/nt_base.c |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
112 --- GraphicsMagick-1.3.17-orig/magick/nt_base.c 2011-12-24 14:34:17 -0500 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
113 +++ GraphicsMagick-1.3.17/magick/nt_base.c 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
114 @@ -67,6 +67,7 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
115 DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
116 #endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
117 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
118 +#ifndef HAVE_DIRENT_H |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
119 /* |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
120 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
121 % % |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
122 @@ -98,6 +99,7 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
123 MagickFreeMemory(entry); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
124 return 0; |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
125 } |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
126 +#endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
127 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
128 /* |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
129 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
130 @@ -2091,6 +2093,7 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
131 return(0); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
132 } |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
133 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
134 +#ifndef HAVE_DIRENT_H |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
135 /* |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
136 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
137 % % |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
138 @@ -2261,3 +2264,4 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
139 return(0); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
140 } |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
141 #endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
142 +#endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
143 diff -ur GraphicsMagick-1.3.17-orig/magick/static.c GraphicsMagick-1.3.17/magick/static.c |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
144 --- GraphicsMagick-1.3.17-orig/magick/static.c 2012-10-13 17:30:22 -0400 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
145 +++ GraphicsMagick-1.3.17/magick/static.c 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
146 @@ -255,9 +255,6 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
147 RegisterXCImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
148 RegisterXCFImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
149 RegisterXPMImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
150 -#if defined(_VISUALC_) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
151 - RegisterXTRNImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
152 -#endif /* defined(_VISUALC_) */ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
153 #if defined(HasX11) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
154 RegisterXWDImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
155 #endif /* defined(HasX11) */ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
156 @@ -410,9 +407,6 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
157 UnregisterXCImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
158 UnregisterXCFImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
159 UnregisterXPMImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
160 -#if defined(_VISUALC_) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
161 - UnregisterXTRNImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
162 -#endif /* defined(_VISUALC_) */ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
163 #if defined(HasX11) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
164 UnregisterXWDImage(); |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
165 #endif /* defined(HasX11) */ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
166 diff -ur GraphicsMagick-1.3.17-orig/magick/studio.h GraphicsMagick-1.3.17/magick/studio.h |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
167 --- GraphicsMagick-1.3.17-orig/magick/studio.h 2012-10-13 17:30:22 -0400 |
3150
65fc638bdd8e
[MSVC] fix incompatible definition of off_t betweeb GraphicsMagick and octave.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3105
diff
changeset
|
168 +++ GraphicsMagick-1.3.17/magick/studio.h 2013-07-18 08:43:30 -0400 |
3105
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
169 @@ -164,6 +164,10 @@ |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
170 # include <pwd.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
171 #endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
172 |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
173 +#if defined(_MSC_VER) && defined(HAVE_DIRENT_H) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
174 +# include <dirent.h> |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
175 +#endif |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
176 + |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
177 #if !defined(S_ISDIR) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
178 # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) |
728a29b93060
[MSVC] enable GraphicsMagick compilation, bump lcms requirement to 2.X.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
179 #endif |