]>
Commit | Line | Data |
---|---|---|
63e0c8db JB |
1 | --- avifile-0.7-0.7.41/include/utils.h.orig 2002-09-24 09:19:22.000000000 +0200 |
2 | +++ avifile-0.7-0.7.41/include/utils.h 2004-12-05 03:48:50.781020072 +0100 | |
3 | @@ -38,7 +38,7 @@ | |
4 | * function to retrieve/store data in machine independent format | |
5 | * - right now dump implementation - as we could check functionality | |
6 | */ | |
7 | -static inline uint16_t avm_get_le16(const void* p) __THROW { | |
8 | +static inline uint16_t __NTH(avm_get_le16(const void* p)) { | |
9 | #ifdef WORDS_BIGENDIAN | |
10 | const uint8_t* c = (const uint8_t*) p; | |
11 | return c[0] | c[1] << 8; | |
12 | @@ -47,7 +47,7 @@ | |
13 | #endif | |
14 | } | |
15 | ||
16 | -static inline uint8_t* avm_set_le16(void* p, uint16_t v) __THROW { | |
17 | +static inline uint8_t* __NTH(avm_set_le16(void* p, uint16_t v)) { | |
18 | uint8_t* b = (uint8_t*) p; | |
19 | #ifdef WORDS_BIGENDIAN | |
20 | b[0] = v & 0xff; | |
21 | @@ -58,7 +58,7 @@ | |
22 | return b; | |
23 | } | |
24 | ||
25 | -static inline uint32_t avm_get_le32(const void* p) __THROW { | |
26 | +static inline uint32_t __NTH(avm_get_le32(const void* p)) { | |
27 | #ifdef WORDS_BIGENDIAN | |
28 | const uint8_t* c = (const uint8_t*) p; | |
29 | return c[0] | c[1] << 8 | c[2] << 16 | c[3] << 24; | |
30 | @@ -67,7 +67,7 @@ | |
31 | #endif | |
32 | } | |
33 | ||
34 | -static inline uint8_t* avm_set_le32(void* p, uint32_t v) __THROW { | |
35 | +static inline uint8_t* __NTH(avm_set_le32(void* p, uint32_t v)) { | |
36 | uint8_t* b = (uint8_t*) p; | |
37 | #ifdef WORDS_BIGENDIAN | |
38 | b[0] = v & 0xff; | |
39 | @@ -80,7 +80,7 @@ | |
40 | return b; | |
41 | } | |
42 | ||
43 | -static inline uint64_t avm_get_le64(const void* p) __THROW { | |
44 | +static inline uint64_t __NTH(avm_get_le64(const void* p)) { | |
45 | #ifdef WORDS_BIGENDIAN | |
46 | const uint8_t* c = (const uint8_t*) p; | |
47 | return avm_get_le32(c) | (((uint64_t)avm_get_le32(c + 4)) << 32); | |
48 | @@ -89,7 +89,7 @@ | |
49 | #endif | |
50 | } | |
51 | ||
52 | -static inline uint16_t avm_get_be16(const void* p) __THROW { | |
53 | +static inline uint16_t __NTH(avm_get_be16(const void* p)) { | |
54 | #ifdef WORDS_BIGENDIAN | |
55 | return *(const uint16_t*)p; | |
56 | #else | |
57 | @@ -98,14 +98,14 @@ | |
58 | #endif | |
59 | } | |
60 | ||
61 | -static inline uint8_t* avm_set_be16(void* p, uint16_t v) __THROW { | |
62 | +static inline uint8_t* __NTH(avm_set_be16(void* p, uint16_t v)) { | |
63 | uint8_t* b = (uint8_t*) p; | |
64 | b[0] = (v >> 8) & 0xff; | |
65 | b[1] = v & 0xff; | |
66 | return b; | |
67 | } | |
68 | ||
69 | -static inline uint32_t avm_get_be32(const void* p) __THROW { | |
70 | +static inline uint32_t __NTH(avm_get_be32(const void* p)) { | |
71 | #ifdef WORDS_BIGENDIAN | |
72 | return *(const uint32_t*)p; | |
73 | #else | |
74 | @@ -114,7 +114,7 @@ | |
75 | #endif | |
76 | } | |
77 | ||
78 | -static inline uint8_t* avm_set_be32(void* p, uint32_t v) __THROW { | |
79 | +static inline uint8_t* __NTH(avm_set_be32(void* p, uint32_t v)) { | |
80 | uint8_t* b = (uint8_t*) p; | |
81 | b[0] = (v >> 24) & 0xff; | |
82 | b[1] = (v >> 16) & 0xff; | |
83 | @@ -123,7 +123,7 @@ | |
84 | return b; | |
85 | } | |
86 | ||
87 | -static inline uint64_t avm_get_be64(const void* p) __THROW { | |
88 | +static inline uint64_t __NTH(avm_get_be64(const void* p)) { | |
89 | #ifdef WORDS_BIGENDIAN | |
90 | return *(const uint64_t*)p; | |
91 | #else | |
92 | @@ -132,15 +132,15 @@ | |
93 | #endif | |
94 | } | |
95 | ||
96 | -static inline int avm_img_is_rgb(fourcc_t fmt) __THROW | |
97 | +static inline int __NTH(avm_img_is_rgb(fourcc_t fmt)) | |
98 | { | |
99 | return ((fmt & 0xffffff00) == IMG_FMT_RGB); | |
100 | } | |
101 | -static inline int avm_img_is_bgr(fourcc_t fmt) __THROW | |
102 | +static inline int __NTH(avm_img_is_bgr(fourcc_t fmt)) | |
103 | { | |
104 | return ((fmt & 0xffffff00) == IMG_FMT_BGR); | |
105 | } | |
106 | -static inline int avm_img_get_depth(fourcc_t fmt) __THROW | |
107 | +static inline int __NTH(avm_img_get_depth(fourcc_t fmt)) | |
108 | { | |
109 | return fmt & 0xff; | |
110 | } | |
111 | --- avifile-0.7-0.7.41/lib/common/fcc_type.c.orig 2002-11-01 12:46:58.000000000 +0100 | |
112 | +++ avifile-0.7-0.7.41/lib/common/fcc_type.c 2004-12-05 03:48:14.692506360 +0100 | |
113 | @@ -4,7 +4,7 @@ | |
114 | ||
115 | //#include <stdio.h> | |
116 | ||
117 | -const char* avm_fcc_name(fourcc_t fcc) __THROW | |
118 | +const char* __NTH(avm_fcc_name(fourcc_t fcc)) | |
119 | { | |
120 | switch (fcc) | |
121 | { | |
122 | @@ -106,7 +106,7 @@ | |
123 | { 0, "Unknown" } | |
124 | }; | |
125 | ||
126 | -const char *avm_img_format_name(fourcc_t fmt) __THROW | |
127 | +const char * __NTH(avm_img_format_name(fourcc_t fmt)) | |
128 | { | |
129 | const struct dts* t = data; | |
130 | ||
131 | --- avifile-0.7-0.7.41/lib/common/utils.c.orig 2002-07-04 20:59:31.000000000 +0200 | |
132 | +++ avifile-0.7-0.7.41/lib/common/utils.c 2004-12-05 03:51:28.009117768 +0100 | |
133 | @@ -10,7 +10,7 @@ | |
134 | uint_t (*localcount)(void); | |
135 | int64_t (*longcount)(void); | |
136 | ||
137 | -WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) __THROW | |
138 | +WAVEFORMATEX* __NTH(avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf)) | |
139 | { | |
140 | wf->wFormatTag = avm_get_le16(&wf->wFormatTag); | |
141 | wf->nChannels = avm_get_le16(&wf->nChannels); | |
142 | @@ -22,7 +22,7 @@ | |
143 | return wf; | |
144 | } | |
145 | ||
146 | -BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) __THROW | |
147 | +BITMAPINFOHEADER* __NTH(avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi)) | |
148 | { | |
149 | bi->biSize = avm_get_le32(&bi->biSize); | |
150 | bi->biWidth = avm_get_le32(&bi->biWidth); | |
151 | @@ -44,7 +44,7 @@ | |
152 | * (Note: on solaris, usleep is not thread-safe) | |
153 | */ | |
154 | #ifndef WIN32 | |
155 | -int avm_usleep(unsigned long delay) __THROW | |
156 | +int __NTH(avm_usleep(unsigned long delay)) | |
157 | { | |
158 | #if HAVE_NANOSLEEP | |
159 | struct timespec tsp; | |
160 | @@ -62,7 +62,7 @@ | |
161 | * Solaris (maybe other operating systems, too) does not have avm_setenv(), | |
162 | * and avm_unsetenv() in libc, provide our own implementation. | |
163 | */ | |
164 | -int avm_setenv(const char *name, const char *value, int overwrite) __THROW | |
165 | +int __NTH(avm_setenv(const char *name, const char *value, int overwrite)) | |
166 | { | |
167 | #if HAVE_SETENV | |
168 | return setenv(name, value, overwrite); | |
169 | @@ -80,7 +80,7 @@ | |
170 | #endif | |
171 | } | |
172 | ||
173 | -void avm_unsetenv(const char *name) __THROW | |
174 | +void __NTH(avm_unsetenv(const char *name)) | |
175 | { | |
176 | #if HAVE_UNSETENV | |
177 | unsetenv(name); | |
178 | --- avifile-0.7-0.7.41/lib/common/wave_type.c.orig 2002-11-29 14:09:46.000000000 +0100 | |
179 | +++ avifile-0.7-0.7.41/lib/common/wave_type.c 2004-12-05 03:52:52.639252032 +0100 | |
180 | @@ -3,7 +3,7 @@ | |
181 | #include <string.h> | |
182 | #include <stdio.h> | |
183 | ||
184 | -const char* avm_wave_format_name(short fmt) __THROW | |
185 | +const char* __NTH(avm_wave_format_name(short fmt)) | |
186 | { | |
187 | switch ((unsigned short)fmt) | |
188 | { | |
189 | @@ -46,7 +46,7 @@ | |
190 | } | |
191 | } | |
192 | ||
193 | -char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf) __THROW | |
194 | +char* __NTH(avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf)) | |
195 | { | |
196 | if (buf) | |
197 | { |