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
|
--- exif.c.orig 2004-06-07 09:58:04 UTC
+++ exif.c
@@ -33,11 +33,11 @@ enum {
HEADER_OFFSET2 = 8
};
-#define SWAP_ENDIAN_LONG(val) ((unsigned long) ( \
- (((unsigned long) (val) & (unsigned long) 0x000000ffU) << 24) | \
- (((unsigned long) (val) & (unsigned long) 0x0000ff00U) << 8) | \
- (((unsigned long) (val) & (unsigned long) 0x00ff0000U) >> 8) | \
- (((unsigned long) (val) & (unsigned long) 0xff000000U) >> 24)))
+#define SWAP_ENDIAN_LONG(val) ((unsigned int) ( \
+ (((unsigned int) (val) & (unsigned int) 0x000000ffU) << 24) | \
+ (((unsigned int) (val) & (unsigned int) 0x0000ff00U) << 8) | \
+ (((unsigned int) (val) & (unsigned int) 0x00ff0000U) >> 8) | \
+ (((unsigned int) (val) & (unsigned int) 0xff000000U) >> 24)))
#define SWAP_ENDIAN_SHORT(val) ((unsigned short) ( \
(((unsigned short) (val) & (unsigned short) 0x00ff) << 8) | \
@@ -46,14 +46,14 @@ is_little_endian ()
static int
is_little_endian ()
{
- static long retval = -1;
+ static int retval = -1;
if (retval == -1) {
- long n = 1;
+ int n = 1;
char *p = (char *)&n;
char x[] = {1, 0, 0, 0};
- assert(sizeof(long) == 4);
+ assert(sizeof(int) == 4);
if (memcmp(p, x, 4) == 0) {
retval = 1;
} else {
@@ -63,8 +63,8 @@ is_little_endian ()
return retval;
}
-static unsigned long
-ulong_from_le (unsigned long x)
+static unsigned int
+uint_from_le (unsigned int x)
{
if (is_little_endian()) {
return x;
@@ -83,8 +83,8 @@ ushort_from_be (unsigned short x)
}
}
-static unsigned long
-ulong_from_be (unsigned long x)
+static unsigned int
+uint_from_be (unsigned int x)
{
if (is_little_endian()) {
return SWAP_ENDIAN_LONG(x);
@@ -115,7 +115,7 @@ static int
static int
-efseek (FILE *stream, long offset, int whence)
+efseek (FILE *stream, int offset, int whence)
{
int x = fseek(stream, offset, whence);
if (x != 0)
@@ -142,16 +142,16 @@ typedef void (*TraverseFunc) (FILE *fp,
typedef void (*TraverseFunc) (FILE *fp,
unsigned short tag,
unsigned short type,
- unsigned long size,
- unsigned long value,
+ unsigned int size,
+ unsigned int value,
void *data);
static void
get_special_offset (FILE *fp,
unsigned short tag,
unsigned short type,
- unsigned long size,
- unsigned long value,
+ unsigned int size,
+ unsigned int value,
void *data)
{
if (tag == 0x8769) {
@@ -163,12 +163,12 @@ get_time (FILE *fp,
get_time (FILE *fp,
unsigned short tag,
unsigned short type,
- unsigned long size,
- unsigned long value,
+ unsigned int size,
+ unsigned int value,
void *data)
{
if (tag == 0x9003) {
- long curpos;
+ int curpos;
char buf[BUFSIZ];
struct tm t;
@@ -204,16 +204,16 @@ read_ushort (FILE *fp, int le_exif_p)
return ushort_from_be(x);
}
-static unsigned long
-read_ulong (FILE *fp, int le_exif_p)
+static unsigned int
+read_uint (FILE *fp, int le_exif_p)
{
- unsigned long x;
+ unsigned int x;
- efread(&x, sizeof(unsigned long), 1, fp);
+ efread(&x, sizeof(unsigned int), 1, fp);
if (le_exif_p)
- return ulong_from_le(x);
+ return uint_from_le(x);
else
- return ulong_from_be(x);
+ return uint_from_be(x);
}
static int
@@ -225,12 +225,12 @@ read_directory (FILE *fp, TraverseFunc func, void *dat
n = read_ushort(fp, le_exif_p);
for (i = 0; i < n; i++) {
unsigned short tag, type;
- unsigned long size, value;
+ unsigned int size, value;
tag = read_ushort(fp, le_exif_p);
type = read_ushort(fp, le_exif_p);
- size = read_ulong(fp, le_exif_p);
- value = read_ulong(fp, le_exif_p);
+ size = read_uint(fp, le_exif_p);
+ value = read_uint(fp, le_exif_p);
func(fp, tag, type, size, value, data);
}
|
