Revert of Roll src/third_party/WebKit e0eac24:489c548 (svn 193311:193320) (patchset...
[chromium-blink-merge.git] / third_party / libexif / chromium.patch
blob79e6a775d2b3ef89207fe8b4c18af874c5efd745
1 diff -urN libexif-0.6.21/config.h libexif-0.6.21.modified/config.h
2 --- libexif-0.6.21/config.h 1969-12-31 16:00:00.000000000 -0800
3 +++ libexif-0.6.21.modified/config.h 1969-12-31 16:00:00.000000000 -0800
4 @@ -0,0 +1,360 @@
5 +#if defined(_WIN32)
6 +/* config.h. Generated by configure. */
7 +/* config.h.in. Generated from configure.ac by autoheader. */
9 +/* Define to 1 if translation of program messages to the user's native
10 + language is requested. */
11 +/* #undef ENABLE_NLS 1 */
13 +/* The gettext domain we're using */
14 +/* #undef GETTEXT_PACKAGE "libexif-12" */
16 +/* Define locale directory. */
17 +/* #undef LOCALEDIR "UTF-8" */
19 +/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and
20 + * LOCALE_DIR */
21 +/* #undef BIND_TEXTDOMAIN 1 */
23 +/* Define if the GNU dcgettext() function is already present or preinstalled.
24 + */
25 +/* #undef HAVE_DCGETTEXT 1 */
27 +/* Define to 1 if you have the <dlfcn.h> header file. */
28 +#define HAVE_DLFCN_H 1
30 +/* Define if the GNU gettext() function is already present or preinstalled. */
31 +#define HAVE_GETTEXT 1
33 +/* Define if you have the iconv() function. */
34 +#define HAVE_ICONV 1
36 +/* Define to 1 if you have the <inttypes.h> header file. */
37 +#define HAVE_INTTYPES_H 1
39 +/* Define to 1 if you have the <memory.h> header file. */
40 +#define HAVE_MEMORY_H 1
42 +/* Define to 1 if you have the <stdint.h> header file. */
43 +/* #undef HAVE_STDINT_H 1 */
45 +/* Define to 1 if you have the <stdlib.h> header file. */
46 +#define HAVE_STDLIB_H 1
48 +/* Define to 1 if you have the <strings.h> header file. */
49 +#define HAVE_STRINGS_H 1
51 +/* Define to 1 if you have the <string.h> header file. */
52 +#define HAVE_STRING_H 1
54 +/* Define to 1 if you have the <sys/stat.h> header file. */
55 +#define HAVE_SYS_STAT_H 1
57 +/* Define to 1 if you have the <sys/types.h> header file. */
58 +#define HAVE_SYS_TYPES_H 1
60 +/* Define to 1 if you have the <unistd.h> header file. */
61 +#define HAVE_UNISTD_H 1
63 +/* Define as const if the declaration of iconv() needs const. */
64 +#define ICONV_CONST
66 +/* Name of package */
67 +#define PACKAGE "libexif"
69 +/* Define to the address where bug reports for this package should be sent. */
70 +#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net"
72 +/* Define to the full name of this package. */
73 +#define PACKAGE_NAME "EXIF library"
75 +/* Define to the full name and version of this package. */
76 +#define PACKAGE_STRING "EXIF library 0.6.21"
78 +/* Define to the one symbol short name of this package. */
79 +#define PACKAGE_TARNAME "libexif"
81 +/* Define to the version of this package. */
82 +#define PACKAGE_VERSION "0.6.21"
84 +/* Define to 1 if you have the ANSI C header files. */
85 +#define STDC_HEADERS 1
87 +/* Version number of package */
88 +#define VERSION "0.6.21"
90 +#elif !defined(__APPLE__)
91 +/* config.h. Generated by configure. */
92 +/* config.h.in. Generated from configure.ac by autoheader. */
94 +/* #define __cplusplus 1 */
95 +#define LOCALEDIR "UTF-8"
97 +/* Define to 1 if translation of program messages to the user's native
98 + language is requested. */
99 +/* #undef ENABLE_NLS */
101 +/* The gettext domain we're using */
102 +/* #undef GETTEXT_PACKAGE "libexif-12" */
104 +/* Define locale directory. */
105 +/* #undef LOCALEDIR "UTF-8" */
107 +/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and
108 + * LOCALE_DIR */
109 +/* #undef BIND_TEXTDOMAIN 1 */
111 +/* Define if the GNU dcgettext() function is already present or preinstalled.
112 + */
113 +#define HAVE_DCGETTEXT 1
115 +/* Define to 1 if you have the <dlfcn.h> header file. */
116 +#define HAVE_DLFCN_H 1
118 +/* Define if the GNU gettext() function is already present or preinstalled. */
119 +#define HAVE_GETTEXT 1
121 +/* Define if you have the iconv() function. */
122 +#define HAVE_ICONV 1
124 +/* Define to 1 if you have the <inttypes.h> header file. */
125 +#define HAVE_INTTYPES_H 1
127 +/* Define to 1 if you have the <memory.h> header file. */
128 +#define HAVE_MEMORY_H 1
130 +/* Define to 1 if you have the <stdint.h> header file. */
131 +#define HAVE_STDINT_H 1
133 +/* Define to 1 if you have the <stdlib.h> header file. */
134 +#define HAVE_STDLIB_H 1
136 +/* Define to 1 if you have the <strings.h> header file. */
137 +#define HAVE_STRINGS_H 1
139 +/* Define to 1 if you have the <string.h> header file. */
140 +#define HAVE_STRING_H 1
142 +/* Define to 1 if you have the <sys/stat.h> header file. */
143 +#define HAVE_SYS_STAT_H 1
145 +/* Define to 1 if you have the <sys/types.h> header file. */
146 +#define HAVE_SYS_TYPES_H 1
148 +/* Define to 1 if you have the <unistd.h> header file. */
149 +#define HAVE_UNISTD_H 1
151 +/* Define as const if the declaration of iconv() needs const. */
152 +#define ICONV_CONST
154 +/* Name of package */
155 +#define PACKAGE "libexif"
157 +/* Define to the address where bug reports for this package should be sent. */
158 +#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net"
160 +/* Define to the full name of this package. */
161 +#define PACKAGE_NAME "EXIF library"
163 +/* Define to the full name and version of this package. */
164 +#define PACKAGE_STRING "EXIF library 0.6.21"
166 +/* Define to the one symbol short name of this package. */
167 +#define PACKAGE_TARNAME "libexif"
169 +/* Define to the version of this package. */
170 +#define PACKAGE_VERSION "0.6.21"
172 +/* Define to 1 if you have the ANSI C header files. */
173 +#define STDC_HEADERS 1
175 +/* Version number of package */
176 +#define VERSION "0.6.21"
178 +/* Define to empty if `const' does not conform to ANSI C. */
179 +/* #undef const */
180 +#else // defined(__APPLE__)
182 +// We need different definitions for the iPhone from desktop OS X,
183 +// we get the necessary #define from TargetConditionals.h
184 +#include <TargetConditionals.h>
186 +#if TARGET_OS_IPHONE
188 +/* config.h. Generated from config.h.in by configure. */
189 +/* config.h.in. Generated from configure.ac by autoheader. */
191 +/* Define to 1 if translation of program messages to the user's native
192 + language is requested. */
193 +/* #undef ENABLE_NLS */
195 +/* The gettext domain we're using */
196 +/* #undef GETTEXT_PACKAGE "libexif-12" */
198 +/* Define locale directory. */
199 +/* #undef LOCALEDIR "UTF-8" */
201 +/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and
202 + * LOCALE_DIR */
203 +/* #undef BIND_TEXTDOMAIN 1 */
205 +/* Define if the GNU dcgettext() function is already present or preinstalled.
206 + */
207 +/* #undef HAVE_DCGETTEXT */
209 +/* Define to 1 if you have the <dlfcn.h> header file. */
210 +#define HAVE_DLFCN_H 1
212 +/* Define if the GNU gettext() function is already present or preinstalled. */
213 +/* #undef HAVE_GETTEXT */
215 +/* Define if you have the iconv() function. */
216 +/* #undef HAVE_ICONV */
218 +/* Define to 1 if you have the <inttypes.h> header file. */
219 +#define HAVE_INTTYPES_H 1
221 +/* Define to 1 if you have the <memory.h> header file. */
222 +#define HAVE_MEMORY_H 1
224 +/* Define to 1 if you have the <stdint.h> header file. */
225 +#define HAVE_STDINT_H 1
227 +/* Define to 1 if you have the <stdlib.h> header file. */
228 +#define HAVE_STDLIB_H 1
230 +/* Define to 1 if you have the <strings.h> header file. */
231 +#define HAVE_STRINGS_H 1
233 +/* Define to 1 if you have the <string.h> header file. */
234 +#define HAVE_STRING_H 1
236 +/* Define to 1 if you have the <sys/stat.h> header file. */
237 +#define HAVE_SYS_STAT_H 1
239 +/* Define to 1 if you have the <sys/types.h> header file. */
240 +#define HAVE_SYS_TYPES_H 1
242 +/* Define to 1 if you have the <unistd.h> header file. */
243 +#define HAVE_UNISTD_H 1
245 +/* Define as const if the declaration of iconv() needs const. */
246 +/* #undef ICONV_CONST */
248 +/* Name of package */
249 +#define PACKAGE "libexif"
251 +/* Define to the address where bug reports for this package should be sent. */
252 +#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net"
254 +/* Define to the full name of this package. */
255 +#define PACKAGE_NAME "EXIF library"
257 +/* Define to the full name and version of this package. */
258 +#define PACKAGE_STRING "EXIF library 0.6.21"
260 +/* Define to the one symbol short name of this package. */
261 +#define PACKAGE_TARNAME "libexif"
263 +/* Define to the version of this package. */
264 +#define PACKAGE_VERSION "0.6.21"
266 +/* Define to 1 if you have the ANSI C header files. */
267 +#define STDC_HEADERS 1
269 +/* Version number of package */
270 +#define VERSION "0.6.21"
272 +/* Define to empty if `const' does not conform to ANSI C. */
273 +/* #undef const */
274 +#else // !TARGET_OS_IPHONE
276 +/* config.h. Generated from config.h.in by configure. */
277 +/* config.h.in. Generated from configure.ac by autoheader. */
279 +/* Define to 1 if translation of program messages to the user's native
280 + language is requested. */
281 +/* #undef ENABLE_NLS */
283 +/* The gettext domain we're using */
284 +/* #undef GETTEXT_PACKAGE "libexif-12" */
286 +/* Define locale directory. */
287 +/* #undef LOCALEDIR "UTF-8" */
289 +/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and
290 + * LOCALE_DIR */
291 +/* #undef BIND_TEXTDOMAIN 1 */
293 +/* Define if the GNU dcgettext() function is already present or preinstalled.
294 + */
295 +/* #undef HAVE_DCGETTEXT */
297 +/* Define to 1 if you have the <dlfcn.h> header file. */
298 +#define HAVE_DLFCN_H 1
300 +/* Define if the GNU gettext() function is already present or preinstalled. */
301 +/* #undef HAVE_GETTEXT */
303 +/* Define if you have the iconv() function. */
304 +#define HAVE_ICONV 1
306 +/* Define to 1 if you have the <inttypes.h> header file. */
307 +#define HAVE_INTTYPES_H 1
309 +/* Define to 1 if you have the <memory.h> header file. */
310 +#define HAVE_MEMORY_H 1
312 +/* Define to 1 if you have the <stdint.h> header file. */
313 +#define HAVE_STDINT_H 1
315 +/* Define to 1 if you have the <stdlib.h> header file. */
316 +#define HAVE_STDLIB_H 1
318 +/* Define to 1 if you have the <strings.h> header file. */
319 +#define HAVE_STRINGS_H 1
321 +/* Define to 1 if you have the <string.h> header file. */
322 +#define HAVE_STRING_H 1
324 +/* Define to 1 if you have the <sys/stat.h> header file. */
325 +#define HAVE_SYS_STAT_H 1
327 +/* Define to 1 if you have the <sys/types.h> header file. */
328 +#define HAVE_SYS_TYPES_H 1
330 +/* Define to 1 if you have the <unistd.h> header file. */
331 +#define HAVE_UNISTD_H 1
333 +/* Define as const if the declaration of iconv() needs const. */
334 +#define ICONV_CONST
336 +/* Name of package */
337 +#define PACKAGE "libexif"
339 +/* Define to the address where bug reports for this package should be sent. */
340 +#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net"
342 +/* Define to the full name of this package. */
343 +#define PACKAGE_NAME "EXIF library"
345 +/* Define to the full name and version of this package. */
346 +#define PACKAGE_STRING "EXIF library 0.6.21"
348 +/* Define to the one symbol short name of this package. */
349 +#define PACKAGE_TARNAME "libexif"
351 +/* Define to the version of this package. */
352 +#define PACKAGE_VERSION "0.6.21"
354 +/* Define to 1 if you have the ANSI C header files. */
355 +#define STDC_HEADERS 1
357 +/* Version number of package */
358 +#define VERSION "0.6.21"
360 +/* Define to empty if `const' does not conform to ANSI C. */
361 +/* #undef const */
362 +#endif // TARGET_OS_IPHONE
364 +#endif // _WIN32
365 diff -urN libexif-0.6.21/libexif/canon/mnote-canon-tag.c libexif-0.6.21.modified/libexif/canon/mnote-canon-tag.c
366 --- libexif-0.6.21/libexif/canon/mnote-canon-tag.c 1969-12-31 16:00:00.000000000 -0800
367 +++ libexif-0.6.21.modified/libexif/canon/mnote-canon-tag.c 1969-12-31 16:00:00.000000000 -0800
368 @@ -160,7 +160,9 @@
370 unsigned int i;
372 +#if defined(BIND_TEXTDOMAIN)
373 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
374 +#endif
375 for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
376 if (table[i].tag == t) return (_(table[i].title));
377 return NULL;
378 @@ -194,7 +196,9 @@
379 if (table[i].tag == t) {
380 if (!table[i].description || !*table[i].description)
381 return "";
382 +#if defined(BIND_TEXTDOMAIN)
383 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
384 +#endif
385 return _(table[i].description);
387 return NULL;
388 diff -urN libexif-0.6.21/libexif/exif-entry.c libexif-0.6.21.modified/libexif/exif-entry.c
389 --- libexif-0.6.21/libexif/exif-entry.c 1969-12-31 16:00:00.000000000 -0800
390 +++ libexif-0.6.21.modified/libexif/exif-entry.c 1969-12-31 16:00:00.000000000 -0800
391 @@ -860,7 +860,9 @@
393 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
395 +#if defined(BIND_TEXTDOMAIN)
396 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
397 +#endif
399 if (!e || !e->parent || !e->parent->parent || !maxlen)
400 return val;
401 diff -urN libexif-0.6.21/libexif/exif-format.c libexif-0.6.21.modified/libexif/exif-format.c
402 --- libexif-0.6.21/libexif/exif-format.c 1969-12-31 16:00:00.000000000 -0800
403 +++ libexif-0.6.21.modified/libexif/exif-format.c 1969-12-31 16:00:00.000000000 -0800
404 @@ -61,7 +61,9 @@
406 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
408 +#if defined(BIND_TEXTDOMAIN)
409 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
410 +#endif
412 for (i = 0; ExifFormatTable[i].name; i++)
413 if (ExifFormatTable[i].format == format)
414 diff -urN libexif-0.6.21/libexif/exif-mem.c libexif-0.6.21.modified/libexif/exif-mem.c
415 --- libexif-0.6.21/libexif/exif-mem.c 1969-12-31 16:00:00.000000000 -0800
416 +++ libexif-0.6.21.modified/libexif/exif-mem.c 1969-12-31 16:00:00.000000000 -0800
417 @@ -1,3 +1,23 @@
418 + /* exif-mem.c
420 + * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net>
422 + * This library is free software; you can redistribute it and/or
423 + * modify it under the terms of the GNU Lesser General Public
424 + * License as published by the Free Software Foundation; either
425 + * version 2 of the License, or (at your option) any later version.
427 + * This library is distributed in the hope that it will be useful,
428 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
429 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
430 + * Lesser General Public License for more details.
432 + * You should have received a copy of the GNU Lesser General Public
433 + * License along with this library; if not, write to the
434 + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
435 + * Boston, MA 02110-1301 USA.
436 + */
438 #include <libexif/exif-mem.h>
440 #include <stdlib.h>
441 diff -urN libexif-0.6.21/libexif/exif-tag.c libexif-0.6.21.modified/libexif/exif-tag.c
442 --- libexif-0.6.21/libexif/exif-tag.c 1969-12-31 16:00:00.000000000 -0800
443 +++ libexif-0.6.21.modified/libexif/exif-tag.c 1969-12-31 16:00:00.000000000 -0800
444 @@ -877,7 +877,7 @@
445 * Return the number of entries in the EXIF tag table, including the
446 * terminating NULL entry.
448 -inline unsigned int
449 +unsigned int
450 exif_tag_table_count (void)
452 return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]);
453 @@ -990,7 +990,9 @@
455 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
457 +#if defined(BIND_TEXTDOMAIN)
458 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
459 +#endif
460 return _(ExifTagTable[i].title);
463 @@ -1024,7 +1026,9 @@
465 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
467 +#if defined(BIND_TEXTDOMAIN)
468 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
469 +#endif
470 return _(ExifTagTable[i].description);
473 diff -urN libexif-0.6.21/libexif/exif-utils.h libexif-0.6.21.modified/libexif/exif-utils.h
474 --- libexif-0.6.21/libexif/exif-utils.h 1969-12-31 16:00:00.000000000 -0800
475 +++ libexif-0.6.21.modified/libexif/exif-utils.h 1969-12-31 16:00:00.000000000 -0800
476 @@ -31,6 +31,7 @@
477 #include <libexif/exif-format.h>
478 #include <libexif/_stdint.h>
480 +#include "config.h"
482 /* If these definitions don't work for you, please let us fix the
483 * macro generating _stdint.h */
484 diff -urN libexif-0.6.21/libexif/fuji/mnote-fuji-tag.c libexif-0.6.21.modified/libexif/fuji/mnote-fuji-tag.c
485 --- libexif-0.6.21/libexif/fuji/mnote-fuji-tag.c 1969-12-31 16:00:00.000000000 -0800
486 +++ libexif-0.6.21.modified/libexif/fuji/mnote-fuji-tag.c 1969-12-31 16:00:00.000000000 -0800
487 @@ -83,7 +83,9 @@
489 unsigned int i;
491 +#if defined(BIND_TEXTDOMAIN)
492 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
493 +#endif
494 for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
495 if (table[i].tag == t) return (_(table[i].title));
496 return NULL;
497 @@ -98,7 +100,9 @@
498 if (table[i].tag == t) {
499 if (!table[i].description || !*table[i].description)
500 return "";
501 +#if defined(BIND_TEXTDOMAIN)
502 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
503 +#endif
504 return _(table[i].description);
506 return NULL;
507 diff -urN libexif-0.6.21/libexif/olympus/mnote-olympus-tag.c libexif-0.6.21.modified/libexif/olympus/mnote-olympus-tag.c
508 --- libexif-0.6.21/libexif/olympus/mnote-olympus-tag.c 1969-12-31 16:00:00.000000000 -0800
509 +++ libexif-0.6.21.modified/libexif/olympus/mnote-olympus-tag.c 1969-12-31 16:00:00.000000000 -0800
510 @@ -208,7 +208,9 @@
512 unsigned int i;
514 +#if defined(BIND_TEXTDOMAIN)
515 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
516 +#endif
517 for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
518 if (table[i].tag == t) return (_(table[i].title));
519 return NULL;
520 @@ -223,7 +225,9 @@
521 if (table[i].tag == t) {
522 if (!table[i].description || !*table[i].description)
523 return "";
524 +#if defined(BIND_TEXTDOMAIN)
525 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
526 +#endif
527 return _(table[i].description);
529 return NULL;
530 diff -urN libexif-0.6.21/libexif/pentax/mnote-pentax-tag.c libexif-0.6.21.modified/libexif/pentax/mnote-pentax-tag.c
531 --- libexif-0.6.21/libexif/pentax/mnote-pentax-tag.c 1969-12-31 16:00:00.000000000 -0800
532 +++ libexif-0.6.21.modified/libexif/pentax/mnote-pentax-tag.c 1969-12-31 16:00:00.000000000 -0800
533 @@ -153,7 +153,9 @@
535 unsigned int i;
537 +#if defined(BIND_TEXTDOMAIN)
538 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
539 +#endif
540 for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
541 if (table[i].tag == t) return (_(table[i].title));
542 return NULL;
543 @@ -168,7 +170,9 @@
544 if (table[i].tag == t) {
545 if (!table[i].description || !*table[i].description)
546 return "";
547 +#if defined(BIND_TEXTDOMAIN)
548 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
549 +#endif
550 return _(table[i].description);
552 return NULL;
553 diff -urN libexif-0.6.21/libexif/_stdint.h libexif-0.6.21.modified/libexif/_stdint.h
554 --- libexif-0.6.21/libexif/_stdint.h 1969-12-31 16:00:00.000000000 -0800
555 +++ libexif-0.6.21.modified/libexif/_stdint.h 1969-12-31 16:00:00.000000000 -0800
556 @@ -1,2 +1,15 @@
557 /* This file is generated automatically by configure */
558 +#if defined(_WIN32)
559 +// Define C99 equivalent types.
560 +typedef signed char int8_t;
561 +typedef signed short int16_t;
562 +typedef signed int int32_t;
563 +typedef signed long long int64_t;
564 +typedef signed long long ssize_t;
565 +typedef unsigned char uint8_t;
566 +typedef unsigned short uint16_t;
567 +typedef unsigned int uint32_t;
568 +typedef unsigned long long uint64_t;
569 +#else
570 #include <stdint.h>
571 +#endif