1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
|
--- Makefile.gnu.old 2010-12-06 23:37:20.000000000 +0100
+++ Makefile.gnu 2012-02-07 16:25:00.274896402 +0100
@@ -11,7 +11,13 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
-LIBRARIES = -lstdc++
+LIBRARIES = -lstdc++ -lmng -ljpeg \
+ $(shell pkg-config --libs libpng) \
+ $(shell pkg-config --libs libtiff-4) \
+ $(shell pkg-config --libs zlib) \
+ $(shell pkg-config --libs libopenjpeg) \
+ $(shell pkg-config --libs OpenEXR) \
+ $(shell pkg-config --libs libraw)
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
@@ -64,7 +64,7 @@
$(AR) r $@ $(MODULES)
$(SHAREDLIB): $(MODULES)
- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
install:
install -d $(INCDIR) $(INSTALLDIR)
--- Source/FreeImage/J2KHelper.cpp.old 2012-02-07 16:32:41.814898596 +0100
+++ Source/FreeImage/J2KHelper.cpp 2012-02-07 16:33:06.914898715 +0100
@@ -21,7 +21,7 @@
#include "FreeImage.h"
#include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
+#include <openjpeg.h>
/**
Divide an integer by a power of 2 and round upwards
--- Source/FreeImage/PluginEXR.cpp.old 2012-02-07 16:34:01.224898974 +0100
+++ Source/FreeImage/PluginEXR.cpp 2012-02-07 16:35:34.124899415 +0100
@@ -22,16 +22,16 @@
#include "FreeImage.h"
#include "Utilities.h"
-#include "../OpenEXR/IlmImf/ImfIO.h"
-#include "../OpenEXR/Iex/Iex.h"
-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
-#include "../OpenEXR/IlmImf/ImfInputFile.h"
-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
-#include "../OpenEXR/IlmImf/ImfChannelList.h"
-#include "../OpenEXR/IlmImf/ImfRgba.h"
-#include "../OpenEXR/IlmImf/ImfArray.h"
-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
-#include "../OpenEXR/Half/half.h"
+#include <ImfIO.h>
+#include <Iex.h>
+#include <ImfOutputFile.h>
+#include <ImfInputFile.h>
+#include <ImfRgbaFile.h>
+#include <ImfChannelList.h>
+#include <ImfRgba.h>
+#include <ImfArray.h>
+#include <ImfPreviewImage.h>
+#include <half.h>
// ==========================================================
--- Source/FreeImage/PluginJ2K.cpp.old 2012-02-07 16:41:39.814901153 +0100
+++ Source/FreeImage/PluginJ2K.cpp 2012-02-07 16:41:59.314901245 +0100
@@ -21,7 +21,7 @@
#include "FreeImage.h"
#include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
+#include <openjpeg.h>
// ==========================================================
// Plugin Interface
--- Source/FreeImage/PluginJP2.cpp.old 2012-02-07 16:42:44.034901460 +0100
+++ Source/FreeImage/PluginJP2.cpp 2012-02-07 16:43:08.214901573 +0100
@@ -21,7 +21,7 @@
#include "FreeImage.h"
#include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
+#include <openjpeg.h>
// ==========================================================
// Plugin Interface
--- Source/FreeImage/PluginPNG.cpp.old 2012-02-07 16:48:30.874903106 +0100
+++ Source/FreeImage/PluginPNG.cpp 2012-02-07 16:49:07.354903280 +0100
@@ -37,8 +37,8 @@
// ----------------------------------------------------------
-#include "../ZLib/zlib.h"
-#include "../LibPNG/png.h"
+#include <zlib.h>
+#include <png.h>
// ----------------------------------------------------------
--- Source/transupp.c.old 2012-02-08 12:37:51.605242277 +0100
+++ Source/transupp.c 2012-02-08 12:36:30.055241889 +0100
@@ -15,8 +15,7 @@
/* Although this file really shouldn't have access to the library internals,
* it's helpful to let it call jround_up() and jcopy_block_row().
*/
-#define JPEG_INTERNALS
-
+#include <jerror.h>
#include "jinclude.h"
#include "jpeglib.h"
#include "transupp.h" /* My own external interface */
--- Source/FreeImage/ZLibInterface.cpp.old 2012-02-08 16:01:24.195300325 +0100
+++ Source/FreeImage/ZLibInterface.cpp 2012-02-08 16:01:46.845300430 +0100
@@ -19,10 +19,10 @@
// Use at your own risk!
// ==========================================================
-#include "../ZLib/zlib.h"
+#include <zlib.h>
#include "FreeImage.h"
#include "Utilities.h"
-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
+#define OS_CODE 0x03
/**
Compresses a source buffer into a target buffer, using the ZLib library.
--- Source/FreeImage/PluginG3.cpp.old 2012-02-10 12:20:04.396058511 +0100
+++ Source/FreeImage/PluginG3.cpp 2012-02-10 13:00:43.486070102 +0100
@@ -20,7 +20,7 @@
// Use at your own risk!
// ==========================================================
-#include "../LibTIFF4/tiffiop.h"
+#include "tiffiop.h"
#include "FreeImage.h"
#include "Utilities.h"
--- Source/FreeImage/PluginJPEG.cpp.old 2012-02-10 13:21:03.816075904 +0100
+++ Source/FreeImage/PluginJPEG.cpp 2012-02-10 13:30:13.236078514 +0100
@@ -35,11 +35,15 @@
#undef FAR
#include <setjmp.h>
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include <string.h>
+#include <stdio.h>
+#include <jconfig.h>
+#include <jpeglib.h>
+#include <jerror.h>
}
+#define SIZEOF(object) ((size_t) sizeof(object))
+
#include "FreeImage.h"
#include "Utilities.h"
--- Source/FreeImageToolkit/JPEGTransform.cpp.old 2012-02-10 13:29:17.546078251 +0100
+++ Source/FreeImageToolkit/JPEGTransform.cpp 2012-02-10 13:30:20.576078553 +0100
@@ -25,10 +25,11 @@
#undef FAR
#include <setjmp.h>
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
-#include "../LibJPEG/transupp.h"
+#include <string.h>
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+#include "transupp.h"
}
#include "FreeImage.h"
--- Makefile.fip.old 2012-02-12 12:21:36.573897004 +0100
+++ Makefile.fip 2012-02-12 12:23:50.612449982 +0100
@@ -11,7 +11,13 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
-LIBRARIES = -lstdc++
+LIBRARIES = -lstdc++ -lmng -ljpeg \
+ $(shell pkg-config --libs libpng) \
+ $(shell pkg-config --libs libtiff-4) \
+ $(shell pkg-config --libs zlib) \
+ $(shell pkg-config --libs libopenjpeg) \
+ $(shell pkg-config --libs OpenEXR) \
+ $(shell pkg-config --libs libraw)
MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
@@ -65,7 +65,7 @@
$(AR) r $@ $(MODULES)
$(SHAREDLIB): $(MODULES)
- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
install:
install -d $(INCDIR) $(INSTALLDIR)
--- Makefile.srcs.old 2012-03-05 21:39:31.927571124 +0100
+++ Makefile.srcs 2012-03-05 21:42:25.724317503 +0100
@@ -88,6 +88,7 @@
Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
Source/FreeImageToolkit/Rescale.cpp \
Source/FreeImageToolkit/Resize.cpp \
+ Source/transupp.c
INCLS = \
Source/FreeImage.h \
Source/CacheFile.h \
@@ -116,3 +117,9 @@
-ISource \
-ISource/Metadata \
-ISource/FreeImageToolkit \
+ $(shell pkg-config --cflags-only-I libpng) \
+ $(shell pkg-config --cflags-only-I libtiff-4) \
+ $(shell pkg-config --cflags-only-I zlib) \
+ $(shell pkg-config --cflags-only-I libopenjpeg) \
+ $(shell pkg-config --cflags-only-I OpenEXR) \
+ $(shell pkg-config --cflags-only-I libraw)
--- Source/FreeImage/PluginRAW.cpp.old 2012-03-05 21:51:38.538302182 +0100
+++ Source/FreeImage/PluginRAW.cpp 2012-03-05 21:53:47.384165909 +0100
@@ -19,7 +19,7 @@
// Use at your own risk!
// ==========================================================
-#include "../LibRawLite/libraw/libraw.h"
+#include <libraw.h>
#include "FreeImage.h"
#include "Utilities.h"
--- Source/Metadata/XTIFF.cpp.old 2012-03-05 22:13:31.139297475 +0100
+++ Source/Metadata/XTIFF.cpp 2012-03-05 22:15:39.778190233 +0100
@@ -29,7 +29,7 @@
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
#endif
-#include "../LibTIFF4/tiffiop.h"
+#include "tiffiop.h"
#include "FreeImage.h"
#include "Utilities.h"
--- Source/FreeImage/PluginTIFF.cpp.old 2012-03-05 22:26:45.056274217 +0100
+++ Source/FreeImage/PluginTIFF.cpp 2012-03-05 22:27:21.506763949 +0100
@@ -37,9 +37,9 @@
#include "FreeImage.h"
#include "Utilities.h"
-#include "../LibTIFF4/tiffiop.h"
+#include "tiffiop.h"
#include "../Metadata/FreeImageTag.h"
-#include "../OpenEXR/Half/half.h"
+#include <half.h>
#include "FreeImageIO.h"
#include "PSDParser.h"
--- Source/tiffiop.h.old 2012-03-05 22:30:17.667627310 +0100
+++ Source/tiffiop.h 2012-03-05 22:30:51.815273794 +0100
@@ -30,7 +30,9 @@
* ``Library-private'' definitions.
*/
-#include "tif_config.h"
+#include <tiffconf.h>
+#define HAVE_SEARCH_H
+#define HAVE_FCNTL_H
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
--- fipMakefile.srcs.old 2012-03-06 08:45:25.895324156 +0100
+++ fipMakefile.srcs 2012-03-06 08:46:47.895534606 +0100
@@ -94,7 +94,8 @@
Wrapper/FreeImagePlus/src/fipMultiPage.cpp \
Wrapper/FreeImagePlus/src/fipTag.cpp \
Wrapper/FreeImagePlus/src/fipWinImage.cpp \
- Wrapper/FreeImagePlus/src/FreeImagePlus.cpp
+ Wrapper/FreeImagePlus/src/FreeImagePlus.cpp \
+ Source/transupp.c
INCLUDE = -I. \
-ISource \
-ISource/Metadata \
|
GitWeb