|
1 --- libtiff/tif_config.h 1970-01-01 01:00:00.000000000 +0100 |
|
2 +++ libtiff/tif_config.h 2008-05-25 00:00:00.000000000 +0200 |
|
3 @@ -0,0 +1,296 @@ |
|
4 +/* |
|
5 + Configuration defines by Trolltech. |
|
6 +*/ |
|
7 + |
|
8 +#include <qglobal.h> |
|
9 +#if defined(Q_OS_WINCE) |
|
10 +# include <qfunctions_wince.h> |
|
11 +#endif |
|
12 + |
|
13 +/* Support CCITT Group 3 & 4 algorithms */ |
|
14 +#define CCITT_SUPPORT 1 |
|
15 + |
|
16 +/* Pick up YCbCr subsampling info from the JPEG data stream to support files |
|
17 + lacking the tag (default enabled). */ |
|
18 +#define CHECK_JPEG_YCBCR_SUBSAMPLING 1 |
|
19 + |
|
20 +/* Support C++ stream API (requires C++ compiler) */ |
|
21 +/* #undef CXX_SUPPORT */ |
|
22 + |
|
23 +/* Treat extra sample as alpha (default enabled). The RGBA interface will |
|
24 + treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many |
|
25 + packages produce RGBA files but don't mark the alpha properly. */ |
|
26 +#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1 |
|
27 + |
|
28 +/* Use the Apple OpenGL framework. */ |
|
29 +/* #undef HAVE_APPLE_OPENGL_FRAMEWORK */ |
|
30 + |
|
31 +/* Define to 1 if you have the <assert.h> header file. */ |
|
32 +#define HAVE_ASSERT_H 1 |
|
33 + |
|
34 +/* Define to 1 if you have the <dlfcn.h> header file. */ |
|
35 +/* #undef HAVE_DLFCN_H */ |
|
36 + |
|
37 +/* Define to 1 if you have the <fcntl.h> header file. */ |
|
38 +#if !defined(Q_OS_WINCE) |
|
39 +#define HAVE_FCNTL_H 1 |
|
40 +#endif |
|
41 + |
|
42 +/* Define to 1 if you have the `floor' function. */ |
|
43 +/* #undef HAVE_FLOOR */ |
|
44 + |
|
45 +/* Define to 1 if you have the `getopt' function. */ |
|
46 +/* #undef HAVE_GETOPT */ |
|
47 + |
|
48 +/* Define as 0 or 1 according to the floating point format suported by the |
|
49 + machine */ |
|
50 +#define HAVE_IEEEFP 1 |
|
51 + |
|
52 +/* Define to 1 if the system has the type `int16'. */ |
|
53 +/* #undef HAVE_INT16 */ |
|
54 +#ifdef Q_OS_AIX |
|
55 +#define HAVE_INT16 1 |
|
56 +#endif |
|
57 + |
|
58 +/* Define to 1 if the system has the type `int32'. */ |
|
59 +/* #undef HAVE_INT32 */ |
|
60 +#ifdef Q_OS_AIX |
|
61 +#define HAVE_INT32 1 |
|
62 +#endif |
|
63 + |
|
64 +/* Define to 1 if the system has the type `int8'. */ |
|
65 +/* #undef HAVE_INT8 */ |
|
66 +#ifdef Q_OS_AIX |
|
67 +#define HAVE_INT8 1 |
|
68 +#endif |
|
69 + |
|
70 +/* Define to 1 if you have the <inttypes.h> header file. */ |
|
71 +/* #undef HAVE_INTTYPES_H */ |
|
72 + |
|
73 +/* Define to 1 if you have the `isascii' function. */ |
|
74 +/* #undef HAVE_ISASCII */ |
|
75 + |
|
76 +/* Define to 1 if you have the `lfind' function. */ |
|
77 +/* #undef HAVE_LFIND */ |
|
78 + |
|
79 +/* Define to 1 if you have the `c' library (-lc). */ |
|
80 +/* #undef HAVE_LIBC */ |
|
81 + |
|
82 +/* Define to 1 if you have the `m' library (-lm). */ |
|
83 +/* #undef HAVE_LIBM */ |
|
84 + |
|
85 +/* Define to 1 if you have the <limits.h> header file. */ |
|
86 +/* #undef HAVE_LIMITS_H */ |
|
87 + |
|
88 +/* Define to 1 if you have the <malloc.h> header file. */ |
|
89 +/* #undef HAVE_MALLOC_H */ |
|
90 + |
|
91 +/* Define to 1 if you have the `memmove' function. */ |
|
92 +/* #undef HAVE_MEMMOVE */ |
|
93 + |
|
94 +/* Define to 1 if you have the <memory.h> header file. */ |
|
95 +/* #undef HAVE_MEMORY_H */ |
|
96 + |
|
97 +/* Define to 1 if you have the `memset' function. */ |
|
98 +/* #undef HAVE_MEMSET */ |
|
99 + |
|
100 +/* Define to 1 if you have the `mmap' function. */ |
|
101 +/* #undef HAVE_MMAP */ |
|
102 + |
|
103 +/* Define to 1 if you have the `pow' function. */ |
|
104 +/* #undef HAVE_POW */ |
|
105 + |
|
106 +/* Define if you have POSIX threads libraries and header files. */ |
|
107 +/* #undef HAVE_PTHREAD */ |
|
108 + |
|
109 +/* Define to 1 if you have the <search.h> header file. */ |
|
110 +#if !defined(Q_OS_WINCE) |
|
111 +#define HAVE_SEARCH_H 1 |
|
112 +#endif |
|
113 + |
|
114 +/* Define to 1 if you have the `sqrt' function. */ |
|
115 +/* #undef HAVE_SQRT */ |
|
116 + |
|
117 +/* Define to 1 if you have the <stdint.h> header file. */ |
|
118 +/* #undef HAVE_STDINT_H */ |
|
119 + |
|
120 +/* Define to 1 if you have the <stdlib.h> header file. */ |
|
121 +/* #undef HAVE_STDLIB_H */ |
|
122 + |
|
123 +/* Define to 1 if you have the `strcasecmp' function. */ |
|
124 +/* #undef HAVE_STRCASECMP */ |
|
125 + |
|
126 +/* Define to 1 if you have the `strchr' function. */ |
|
127 +/* #undef HAVE_STRCHR */ |
|
128 + |
|
129 +/* Define to 1 if you have the <strings.h> header file. */ |
|
130 +/* #undef HAVE_STRINGS_H */ |
|
131 + |
|
132 +/* Define to 1 if you have the <string.h> header file. */ |
|
133 +#define HAVE_STRING_H 1 |
|
134 + |
|
135 +/* Define to 1 if you have the `strrchr' function. */ |
|
136 +/* #undef HAVE_STRRCHR */ |
|
137 + |
|
138 +/* Define to 1 if you have the `strstr' function. */ |
|
139 +/* #undef HAVE_STRSTR */ |
|
140 + |
|
141 +/* Define to 1 if you have the `strtol' function. */ |
|
142 +/* #undef HAVE_STRTOL */ |
|
143 + |
|
144 +/* Define to 1 if you have the `strtoul' function. */ |
|
145 +/* #undef HAVE_STRTOUL */ |
|
146 + |
|
147 +/* Define to 1 if you have the <sys/stat.h> header file. */ |
|
148 +/* #undef HAVE_SYS_STAT_H */ |
|
149 + |
|
150 +/* Define to 1 if you have the <sys/time.h> header file. */ |
|
151 +/* #undef HAVE_SYS_TIME_H */ |
|
152 + |
|
153 +/* Define to 1 if you have the <sys/types.h> header file. */ |
|
154 +#define HAVE_SYS_TYPES_H 1 |
|
155 + |
|
156 +/* Define to 1 if you have the <unistd.h> header file. */ |
|
157 +#define HAVE_UNISTD_H 1 |
|
158 + |
|
159 +/* Define to 1 if you have the <windows.h> header file. */ |
|
160 +/* #undef HAVE_WINDOWS_H */ |
|
161 +#ifdef Q_OS_WIN |
|
162 +#define TIF_PLATFORM_CONSOLE |
|
163 +#endif |
|
164 + |
|
165 +/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian |
|
166 + (Intel) */ |
|
167 +#if (Q_BYTE_ORDER == Q_BIG_ENDIAN) |
|
168 +#define HOST_BIGENDIAN 1 |
|
169 +#else |
|
170 +#define HOST_BIGENDIAN 0 |
|
171 +#endif |
|
172 + |
|
173 +/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */ |
|
174 +#define HOST_FILLORDER FILLORDER_LSB2MSB |
|
175 + |
|
176 +/* Support JPEG compression (requires IJG JPEG library) */ |
|
177 +/* #undef JPEG_SUPPORT */ |
|
178 + |
|
179 +/* Support LogLuv high dynamic range encoding */ |
|
180 +#define LOGLUV_SUPPORT 1 |
|
181 + |
|
182 +/* Define to the sub-directory in which libtool stores uninstalled libraries. |
|
183 + */ |
|
184 +/* #undef LT_OBJDIR */ |
|
185 + |
|
186 +/* Support LZW algorithm */ |
|
187 +#define LZW_SUPPORT 1 |
|
188 + |
|
189 +/* Support Microsoft Document Imaging format */ |
|
190 +#define MDI_SUPPORT 1 |
|
191 + |
|
192 +/* Support NeXT 2-bit RLE algorithm */ |
|
193 +#define NEXT_SUPPORT 1 |
|
194 + |
|
195 +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ |
|
196 +/* #undef NO_MINUS_C_MINUS_O */ |
|
197 + |
|
198 +/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation |
|
199 + fails with unpatched IJG JPEG library) */ |
|
200 +/* #undef OJPEG_SUPPORT */ |
|
201 + |
|
202 +/* Name of package */ |
|
203 +/* #undef PACKAGE */ |
|
204 + |
|
205 +/* Define to the address where bug reports for this package should be sent. */ |
|
206 +/* #undef PACKAGE_BUGREPORT */ |
|
207 + |
|
208 +/* Define to the full name of this package. */ |
|
209 +/* #undef PACKAGE_NAME */ |
|
210 + |
|
211 +/* Define to the full name and version of this package. */ |
|
212 +/* #undef PACKAGE_STRING */ |
|
213 + |
|
214 +/* Define to the one symbol short name of this package. */ |
|
215 +/* #undef PACKAGE_TARNAME */ |
|
216 + |
|
217 +/* Define to the version of this package. */ |
|
218 +/* #undef PACKAGE_VERSION */ |
|
219 + |
|
220 +/* Support Macintosh PackBits algorithm */ |
|
221 +#define PACKBITS_SUPPORT 1 |
|
222 + |
|
223 +/* Support Pixar log-format algorithm (requires Zlib) */ |
|
224 +#define PIXARLOG_SUPPORT 1 |
|
225 + |
|
226 +/* Define to necessary symbol if this constant uses a non-standard name on |
|
227 + your system. */ |
|
228 +/* #undef PTHREAD_CREATE_JOINABLE */ |
|
229 + |
|
230 +/* The size of a `int', as computed by sizeof. */ |
|
231 +#define SIZEOF_INT 4 |
|
232 + |
|
233 +/* The size of a `long', as computed by sizeof. */ |
|
234 +#if (QT_POINTER_SIZE == 8) && !defined(Q_OS_WIN64) |
|
235 +#define SIZEOF_LONG 8 |
|
236 +#else |
|
237 +#define SIZEOF_LONG 4 |
|
238 +#endif |
|
239 + |
|
240 +/* Define to 1 if you have the ANSI C header files. */ |
|
241 +/* #undef STDC_HEADERS */ |
|
242 + |
|
243 +/* Support strip chopping (whether or not to convert single-strip uncompressed |
|
244 + images to mutiple strips of specified size to reduce memory usage) */ |
|
245 +#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP |
|
246 + |
|
247 +/* Default size of the strip in bytes (when strip chopping enabled) */ |
|
248 +/* #undef STRIP_SIZE_DEFAULT */ |
|
249 + |
|
250 +/* Enable SubIFD tag (330) support */ |
|
251 +#define SUBIFD_SUPPORT 1 |
|
252 + |
|
253 +/* Support ThunderScan 4-bit RLE algorithm */ |
|
254 +#define THUNDER_SUPPORT 1 |
|
255 + |
|
256 +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ |
|
257 +/* #undef TIME_WITH_SYS_TIME */ |
|
258 + |
|
259 +/* Define to 1 if your <sys/time.h> declares `struct tm'. */ |
|
260 +/* #undef TM_IN_SYS_TIME */ |
|
261 + |
|
262 +/* Version number of package */ |
|
263 +/* #undef VERSION */ |
|
264 + |
|
265 +/* Define to 1 if your processor stores words with the most significant byte |
|
266 + first (like Motorola and SPARC, unlike Intel and VAX). */ |
|
267 +#if (Q_BYTE_ORDER == Q_BIG_ENDIAN) |
|
268 +#define WORDS_BIGENDIAN 1 |
|
269 +#else |
|
270 +/* #undef WORDS_BIGENDIAN */ |
|
271 +#endif |
|
272 + |
|
273 +/* Define to 1 if the X Window System is missing or not being used. */ |
|
274 +/* #undef X_DISPLAY_MISSING */ |
|
275 + |
|
276 +/* Support Deflate compression */ |
|
277 +#define ZIP_SUPPORT 1 |
|
278 + |
|
279 +/* Number of bits in a file offset, on hosts where this is settable. */ |
|
280 +/* #undef _FILE_OFFSET_BITS */ |
|
281 + |
|
282 +/* Define for large files, on AIX-style hosts. */ |
|
283 +/* #undef _LARGE_FILES */ |
|
284 + |
|
285 +/* Define to empty if `const' does not conform to ANSI C. */ |
|
286 +/* #undef const */ |
|
287 + |
|
288 +/* Define to `__inline__' or `__inline' if that's what the C compiler |
|
289 + calls it, or to nothing if 'inline' is not supported under any name. */ |
|
290 +#ifndef __cplusplus |
|
291 +#undef inline |
|
292 +#define inline |
|
293 +#endif |
|
294 + |
|
295 +/* Define to `long' if <sys/types.h> does not define. */ |
|
296 +/* #undef off_t */ |
|
297 + |
|
298 +/* Define to `unsigned' if <sys/types.h> does not define. */ |
|
299 +/* #undef size_t */ |
|
300 --- libtiff/tiffconf.h 2006-03-23 15:55:22.000000000 +0100 |
|
301 +++ libtiff/tiffconf.h 2008-05-25 00:00:00.000000000 +0200 |
|
302 @@ -1,6 +1,5 @@ |
|
303 -/* libtiff/tiffconf.h. Generated by configure. */ |
|
304 /* |
|
305 - Configuration defines for installed libtiff. |
|
306 + Configuration defines by Trolltech. |
|
307 This file maintained for backward compatibility. Do not use definitions |
|
308 from this file in your programs. |
|
309 */ |
|
310 @@ -8,6 +7,8 @@ |
|
311 #ifndef _TIFFCONF_ |
|
312 #define _TIFFCONF_ |
|
313 |
|
314 +#include <qglobal.h> |
|
315 + |
|
316 /* Define to 1 if the system has the type `int16'. */ |
|
317 /* #undef HAVE_INT16 */ |
|
318 |
|
319 @@ -21,7 +22,11 @@ |
|
320 #define SIZEOF_INT 4 |
|
321 |
|
322 /* The size of a `long', as computed by sizeof. */ |
|
323 +#if (QT_POINTER_SIZE == 8) && !defined(Q_OS_WIN64) |
|
324 +#define SIZEOF_LONG 8 |
|
325 +#else |
|
326 #define SIZEOF_LONG 4 |
|
327 +#endif |
|
328 |
|
329 /* Compatibility stuff. */ |
|
330 |
|
331 @@ -34,13 +39,17 @@ |
|
332 |
|
333 /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian |
|
334 (Intel) */ |
|
335 +#if (Q_BYTE_ORDER == Q_BIG_ENDIAN) |
|
336 +#define HOST_BIGENDIAN 1 |
|
337 +#else |
|
338 #define HOST_BIGENDIAN 0 |
|
339 +#endif |
|
340 |
|
341 /* Support CCITT Group 3 & 4 algorithms */ |
|
342 #define CCITT_SUPPORT 1 |
|
343 |
|
344 /* Support JPEG compression (requires IJG JPEG library) */ |
|
345 -#define JPEG_SUPPORT 1 |
|
346 +/* #undef JPEG_SUPPORT */ |
|
347 |
|
348 /* Support LogLuv high dynamic range encoding */ |
|
349 #define LOGLUV_SUPPORT 1 |
|
350 --- libtiff/tiffiop.h 2006-03-21 17:42:50.000000000 +0100 |
|
351 +++ libtiff/tiffiop.h 2008-05-25 00:00:00.000000000 +0200 |
|
352 @@ -37,7 +37,12 @@ |
|
353 #endif |
|
354 |
|
355 #ifdef HAVE_SYS_TYPES_H |
|
356 +#if !defined(Q_OS_WINCE) |
|
357 # include <sys/types.h> |
|
358 +#else |
|
359 +# include <windows.h> |
|
360 +# include <types.h> |
|
361 +#endif |
|
362 #endif |
|
363 |
|
364 #ifdef HAVE_STRING_H |
|
365 --- libtiff/tif_win32.c 2006-02-07 14:51:03.000000000 +0100 |
|
366 +++ libtiff/tif_win32.c 2008-05-25 00:00:00.000000000 +0200 |
|
367 @@ -29,6 +29,7 @@ |
|
368 * Scott Wagner (wagner@itek.com), Itek Graphix, Rochester, NY USA |
|
369 */ |
|
370 #include "tiffiop.h" |
|
371 +#include <windows.h> |
|
372 |
|
373 static tsize_t |
|
374 _tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size) |