Mercurial > mxe-octave

annotate src/msvc-tiff-1.patch @ 5947:09d3533acacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-cmake.mk, src/cmake.mk: update v3.21.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 11 Nov 2021 09:49:11 -0500
parents 14afb4dd1939
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3102
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur tiff-4.0.3-orig/libtiff/Makefile.in tiff-4.0.3/libtiff/Makefile.in
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- tiff-4.0.3-orig/libtiff/Makefile.in 2012-09-22 12:08:19 -0400
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ tiff-4.0.3/libtiff/Makefile.in 2013-06-26 22:40:20 -0400
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -423,10 +423,12 @@
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 lib_LTLIBRARIES = libtiff.la $(am__append_6)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 libtiff_la_LDFLAGS = -no-undefined -version-info \
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - $(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + $(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8) \
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 + -export-symbols-regex "xXx" -Wl,libtiff.def
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 libtiff_la_LIBADD = $(LIBPORT)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 libtiffxx_la_LDFLAGS = -no-undefined -version-info \
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 - $(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 + $(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10) \
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 + -export-symbols-regex "xXx"
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 libtiffxx_la_DEPENDENCIES = libtiff.la
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 mkg3states_SOURCES = mkg3states.c tif_fax3.h
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 diff -ur tiff-4.0.3-orig/libtiff/tif_stream.cxx tiff-4.0.3/libtiff/tif_stream.cxx
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 --- tiff-4.0.3-orig/libtiff/tif_stream.cxx 2010-12-13 20:45:44 -0500
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 +++ tiff-4.0.3/libtiff/tif_stream.cxx 2013-06-26 22:31:55 -0400
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 @@ -392,6 +392,9 @@
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 } /* extern "C" */
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 +#ifdef _MSC_VER
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +__declspec(dllexport)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 +#endif
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 TIFF*
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 TIFFStreamOpen(const char* name, ostream *os)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 {
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 @@ -408,6 +411,9 @@
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 return _tiffStreamOpen(name, "wm", os);
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 }
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 +#ifdef _MSC_VER
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 +__declspec(dllexport)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 +#endif
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 TIFF*
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 TIFFStreamOpen(const char* name, istream *is)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 {
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 diff -ur tiff-4.0.3-orig/libtiff/tiffiop.h tiff-4.0.3/libtiff/tiffiop.h
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 --- tiff-4.0.3-orig/libtiff/tiffiop.h 2012-06-06 09:35:23 -0400
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 +++ tiff-4.0.3/libtiff/tiffiop.h 2013-06-26 22:35:20 -0400
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 @@ -72,6 +72,10 @@
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 #define FALSE 0
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 #endif
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 +#if defined(_MSC_VER) && !defined(snprintf)
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 +#define snprintf _snprintf
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 +#endif
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 +
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 typedef struct client_info {
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 struct client_info *next;
14afb4dd1939 [MSVC] enable TIFF compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 void *data;