Skip to content

Commit fd381e4

Browse files
zilongshanrenzilongshanren
committed
Merge pull request #168 from andyque/v3
fix mac 32 tiff include files
2 parents 997b892 + 25c5c4c commit fd381e4

File tree

6 files changed

+261
-128
lines changed

6 files changed

+261
-128
lines changed

‎tiff/include/mac/tiff.h

100755100644
File mode changed.

‎tiff/include/mac/tiffconf-32.h

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
/* libtiff/tiffconf.h. Generated from tiffconf.h.in by configure. */
2+
/*
3+
Configuration defines for installed libtiff.
4+
This file maintained for backward compatibility. Do not use definitions
5+
from this file in your programs.
6+
*/
7+
8+
#ifndef _TIFFCONF_
9+
#define _TIFFCONF_
10+
11+
/* Signed 16-bit type */
12+
#define TIFF_INT16_T signed short
13+
14+
/* Signed 32-bit type */
15+
#define TIFF_INT32_T signed int
16+
17+
/* Signed 64-bit type */
18+
#define TIFF_INT64_T signed long long
19+
20+
/* Signed 8-bit type */
21+
#define TIFF_INT8_T signed char
22+
23+
/* Unsigned 16-bit type */
24+
#define TIFF_UINT16_T unsigned short
25+
26+
/* Unsigned 32-bit type */
27+
#define TIFF_UINT32_T unsigned int
28+
29+
/* Unsigned 64-bit type */
30+
#define TIFF_UINT64_T unsigned long long
31+
32+
/* Unsigned 8-bit type */
33+
#define TIFF_UINT8_T unsigned char
34+
35+
/* Signed size type */
36+
#define TIFF_SSIZE_T signed int
37+
38+
/* Pointer difference type */
39+
#define TIFF_PTRDIFF_T ptrdiff_t
40+
41+
/* Define to 1 if the system has the type `int16'. */
42+
/* #undef HAVE_INT16 */
43+
44+
/* Define to 1 if the system has the type `int32'. */
45+
/* #undef HAVE_INT32 */
46+
47+
/* Define to 1 if the system has the type `int8'. */
48+
/* #undef HAVE_INT8 */
49+
50+
/* Compatibility stuff. */
51+
52+
/* Define as 0 or 1 according to the floating point format suported by the
53+
machine */
54+
#define HAVE_IEEEFP 1
55+
56+
/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
57+
#define HOST_FILLORDER FILLORDER_MSB2LSB
58+
59+
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
60+
(Intel) */
61+
#define HOST_BIGENDIAN 0
62+
63+
/* Support CCITT Group 3 & 4 algorithms */
64+
#define CCITT_SUPPORT 1
65+
66+
/* Support JPEG compression (requires IJG JPEG library) */
67+
/* #undef JPEG_SUPPORT */
68+
69+
/* Support JBIG compression (requires JBIG-KIT library) */
70+
/* #undef JBIG_SUPPORT */
71+
72+
/* Support LogLuv high dynamic range encoding */
73+
#define LOGLUV_SUPPORT 1
74+
75+
/* Support LZW algorithm */
76+
#define LZW_SUPPORT 1
77+
78+
/* Support NeXT 2-bit RLE algorithm */
79+
#define NEXT_SUPPORT 1
80+
81+
/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
82+
fails with unpatched IJG JPEG library) */
83+
/* #undef OJPEG_SUPPORT */
84+
85+
/* Support Macintosh PackBits algorithm */
86+
#define PACKBITS_SUPPORT 1
87+
88+
/* Support Pixar log-format algorithm (requires Zlib) */
89+
/* #undef PIXARLOG_SUPPORT */
90+
91+
/* Support ThunderScan 4-bit RLE algorithm */
92+
#define THUNDER_SUPPORT 1
93+
94+
/* Support Deflate compression */
95+
/* #undef ZIP_SUPPORT */
96+
97+
/* Support strip chopping (whether or not to convert single-strip uncompressed
98+
images to mutiple strips of ~8Kb to reduce memory usage) */
99+
#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
100+
101+
/* Enable SubIFD tag (330) support */
102+
#define SUBIFD_SUPPORT 1
103+
104+
/* Treat extra sample as alpha (default enabled). The RGBA interface will
105+
treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
106+
packages produce RGBA files but don't mark the alpha properly. */
107+
#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
108+
109+
/* Pick up YCbCr subsampling info from the JPEG data stream to support files
110+
lacking the tag (default enabled). */
111+
#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
112+
113+
/* Support MS MDI magic number files as TIFF */
114+
#define MDI_SUPPORT 1
115+
116+
/*
117+
* Feature support definitions.
118+
* XXX: These macros are obsoleted. Don't use them in your apps!
119+
* Macros stays here for backward compatibility and should be always defined.
120+
*/
121+
#define COLORIMETRY_SUPPORT
122+
#define YCBCR_SUPPORT
123+
#define CMYK_SUPPORT
124+
#define ICC_SUPPORT
125+
#define PHOTOSHOP_SUPPORT
126+
#define IPTC_SUPPORT
127+
128+
#endif /* _TIFFCONF_ */

‎tiff/include/mac/tiffconf-64.h

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
/* libtiff/tiffconf.h. Generated from tiffconf.h.in by configure. */
2+
/*
3+
Configuration defines for installed libtiff.
4+
This file maintained for backward compatibility. Do not use definitions
5+
from this file in your programs.
6+
*/
7+
8+
#ifndef _TIFFCONF_
9+
#define _TIFFCONF_
10+
11+
/* Signed 16-bit type */
12+
#define TIFF_INT16_T signed short
13+
14+
/* Signed 32-bit type */
15+
#define TIFF_INT32_T signed int
16+
17+
/* Signed 64-bit type */
18+
#define TIFF_INT64_T signed long
19+
20+
/* Signed 8-bit type */
21+
#define TIFF_INT8_T signed char
22+
23+
/* Unsigned 16-bit type */
24+
#define TIFF_UINT16_T unsigned short
25+
26+
/* Unsigned 32-bit type */
27+
#define TIFF_UINT32_T unsigned int
28+
29+
/* Unsigned 64-bit type */
30+
#define TIFF_UINT64_T unsigned long
31+
32+
/* Unsigned 8-bit type */
33+
#define TIFF_UINT8_T unsigned char
34+
35+
/* Signed size type */
36+
#define TIFF_SSIZE_T signed long
37+
38+
/* Pointer difference type */
39+
#define TIFF_PTRDIFF_T ptrdiff_t
40+
41+
/* Define to 1 if the system has the type `int16'. */
42+
/* #undef HAVE_INT16 */
43+
44+
/* Define to 1 if the system has the type `int32'. */
45+
/* #undef HAVE_INT32 */
46+
47+
/* Define to 1 if the system has the type `int8'. */
48+
/* #undef HAVE_INT8 */
49+
50+
/* Compatibility stuff. */
51+
52+
/* Define as 0 or 1 according to the floating point format suported by the
53+
machine */
54+
#define HAVE_IEEEFP 1
55+
56+
/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
57+
#define HOST_FILLORDER FILLORDER_LSB2MSB
58+
59+
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
60+
(Intel) */
61+
#define HOST_BIGENDIAN 0
62+
63+
/* Support CCITT Group 3 & 4 algorithms */
64+
#define CCITT_SUPPORT 1
65+
66+
/* Support JPEG compression (requires IJG JPEG library) */
67+
/* #undef JPEG_SUPPORT */
68+
69+
/* Support JBIG compression (requires JBIG-KIT library) */
70+
/* #undef JBIG_SUPPORT */
71+
72+
/* Support LogLuv high dynamic range encoding */
73+
#define LOGLUV_SUPPORT 1
74+
75+
/* Support LZW algorithm */
76+
#define LZW_SUPPORT 1
77+
78+
/* Support NeXT 2-bit RLE algorithm */
79+
#define NEXT_SUPPORT 1
80+
81+
/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
82+
fails with unpatched IJG JPEG library) */
83+
/* #undef OJPEG_SUPPORT */
84+
85+
/* Support Macintosh PackBits algorithm */
86+
#define PACKBITS_SUPPORT 1
87+
88+
/* Support Pixar log-format algorithm (requires Zlib) */
89+
/* #undef PIXARLOG_SUPPORT */
90+
91+
/* Support ThunderScan 4-bit RLE algorithm */
92+
#define THUNDER_SUPPORT 1
93+
94+
/* Support Deflate compression */
95+
/* #undef ZIP_SUPPORT */
96+
97+
/* Support strip chopping (whether or not to convert single-strip uncompressed
98+
images to mutiple strips of ~8Kb to reduce memory usage) */
99+
#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
100+
101+
/* Enable SubIFD tag (330) support */
102+
#define SUBIFD_SUPPORT 1
103+
104+
/* Treat extra sample as alpha (default enabled). The RGBA interface will
105+
treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
106+
packages produce RGBA files but don't mark the alpha properly. */
107+
#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
108+
109+
/* Pick up YCbCr subsampling info from the JPEG data stream to support files
110+
lacking the tag (default enabled). */
111+
#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
112+
113+
/* Support MS MDI magic number files as TIFF */
114+
#define MDI_SUPPORT 1
115+
116+
/*
117+
* Feature support definitions.
118+
* XXX: These macros are obsoleted. Don't use them in your apps!
119+
* Macros stays here for backward compatibility and should be always defined.
120+
*/
121+
#define COLORIMETRY_SUPPORT
122+
#define YCBCR_SUPPORT
123+
#define CMYK_SUPPORT
124+
#define ICC_SUPPORT
125+
#define PHOTOSHOP_SUPPORT
126+
#define IPTC_SUPPORT
127+
128+
#endif /* _TIFFCONF_ */

‎tiff/include/mac/tiffconf.h

100755100644
Lines changed: 5 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,5 @@
1-
/* libtiff/tiffconf.h. Generated from tiffconf.h.in by configure. */
2-
/*
3-
Configuration defines for installed libtiff.
4-
This file maintained for backward compatibility. Do not use definitions
5-
from this file in your programs.
6-
*/
7-
8-
#ifndef _TIFFCONF_
9-
#define _TIFFCONF_
10-
11-
/* Signed 16-bit type */
12-
#define TIFF_INT16_T signed short
13-
14-
/* Signed 32-bit type */
15-
#define TIFF_INT32_T signed int
16-
17-
/* Signed 64-bit type */
18-
#define TIFF_INT64_T signed long long
19-
20-
/* Signed 8-bit type */
21-
#define TIFF_INT8_T signed char
22-
23-
/* Unsigned 16-bit type */
24-
#define TIFF_UINT16_T unsigned short
25-
26-
/* Unsigned 32-bit type */
27-
#define TIFF_UINT32_T unsigned int
28-
29-
/* Unsigned 64-bit type */
30-
#define TIFF_UINT64_T unsigned long long
31-
32-
/* Unsigned 8-bit type */
33-
#define TIFF_UINT8_T unsigned char
34-
35-
/* Signed size type */
36-
#define TIFF_SSIZE_T signed long long
37-
38-
/* Pointer difference type */
39-
#define TIFF_PTRDIFF_T ptrdiff_t
40-
41-
/* Define to 1 if the system has the type `int16'. */
42-
/* #undef HAVE_INT16 */
43-
44-
/* Define to 1 if the system has the type `int32'. */
45-
/* #undef HAVE_INT32 */
46-
47-
/* Define to 1 if the system has the type `int8'. */
48-
/* #undef HAVE_INT8 */
49-
50-
/* Compatibility stuff. */
51-
52-
/* Define as 0 or 1 according to the floating point format suported by the
53-
machine */
54-
#define HAVE_IEEEFP 1
55-
56-
/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
57-
#define HOST_FILLORDER FILLORDER_LSB2MSB
58-
59-
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
60-
(Intel) */
61-
#define HOST_BIGENDIAN 0
62-
63-
/* Support CCITT Group 3 & 4 algorithms */
64-
#define CCITT_SUPPORT 1
65-
66-
/* Support JPEG compression (requires IJG JPEG library) */
67-
#define JPEG_SUPPORT 1
68-
69-
/* Support JBIG compression (requires JBIG-KIT library) */
70-
/* #undef JBIG_SUPPORT */
71-
72-
/* Support LogLuv high dynamic range encoding */
73-
#define LOGLUV_SUPPORT 1
74-
75-
/* Support LZW algorithm */
76-
#define LZW_SUPPORT 1
77-
78-
/* Support NeXT 2-bit RLE algorithm */
79-
#define NEXT_SUPPORT 1
80-
81-
/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
82-
fails with unpatched IJG JPEG library) */
83-
#define OJPEG_SUPPORT 1
84-
85-
/* Support Macintosh PackBits algorithm */
86-
#define PACKBITS_SUPPORT 1
87-
88-
/* Support Pixar log-format algorithm (requires Zlib) */
89-
#define PIXARLOG_SUPPORT 1
90-
91-
/* Support ThunderScan 4-bit RLE algorithm */
92-
#define THUNDER_SUPPORT 1
93-
94-
/* Support Deflate compression */
95-
#define ZIP_SUPPORT 1
96-
97-
/* Support strip chopping (whether or not to convert single-strip uncompressed
98-
images to mutiple strips of ~8Kb to reduce memory usage) */
99-
#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
100-
101-
/* Enable SubIFD tag (330) support */
102-
#define SUBIFD_SUPPORT 1
103-
104-
/* Treat extra sample as alpha (default enabled). The RGBA interface will
105-
treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
106-
packages produce RGBA files but don't mark the alpha properly. */
107-
#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
108-
109-
/* Pick up YCbCr subsampling info from the JPEG data stream to support files
110-
lacking the tag (default enabled). */
111-
#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
112-
113-
/* Support MS MDI magic number files as TIFF */
114-
#define MDI_SUPPORT 1
115-
116-
/*
117-
* Feature support definitions.
118-
* XXX: These macros are obsoleted. Don't use them in your apps!
119-
* Macros stays here for backward compatibility and should be always defined.
120-
*/
121-
#define COLORIMETRY_SUPPORT
122-
#define YCBCR_SUPPORT
123-
#define CMYK_SUPPORT
124-
#define ICC_SUPPORT
125-
#define PHOTOSHOP_SUPPORT
126-
#define IPTC_SUPPORT
127-
128-
#endif /* _TIFFCONF_ */
1+
#if defined(__LP64__) && __LP64__
2+
#include"tiffconf-64.h"
3+
#else
4+
#include"tiffconf-32.h"
5+
#endif

‎tiff/include/mac/tiffio.h

100755100644
File mode changed.

‎tiff/include/mac/tiffvers.h

100755100644
File mode changed.

0 commit comments

Comments
 (0)