Update third_party/libexif README.chromium and chromium.patch.

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10786007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146860 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 180 insertions, 174 deletions

diff --git a/third_party/libexif/README.chromium b/third_party/libexif/README.chromium
index 98f7cc0..bb2a1a2 100644
--- a/third_party/libexif/README.chromium
+++ b/third_party/libexif/README.chromium
@@ -1,11 +1,11 @@
 Name: EXIF Library
 Short Name: libexif
 URL: http://libexif.sourceforge.net/
-Version: 0.6.20
+Version: 0.6.21
 License: LGPL 2.1
 License File: LICENSE
 Date: 2012-06-04
-Security Critical: yes (Security Audit is in progress. Do not build this with Chromium).
+Security Critical: yes.
 
 Description:
 libexif is a library for parsing, editing, and saving EXIF data. Many maker
diff --git a/third_party/libexif/chromium.patch b/third_party/libexif/chromium.patch
index daa561f..02c9399 100644
--- a/third_party/libexif/chromium.patch
+++ b/third_party/libexif/chromium.patch
@@ -1,16 +1,13 @@
-diff --git a/third_party/libexif/sources/config.h b/third_party/libexif/sources/config.h
-index 1811177..7857662 100644
---- a/third_party/libexif/sources/config.h
-+++ b/third_party/libexif/sources/config.h
-@@ -1,13 +1,24 @@
--/* config.h.  Generated from config.h.in by configure.  */
+diff -urN libexif-0.6.21/config.h libexif-0.6.21.modified/config.h
+--- libexif-0.6.21/config.h	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/config.h	2012-07-14 15:31:49.614388000 -0700
+@@ -0,0 +1,360 @@
 +#if defined(_WIN32)
 +/* config.h.  Generated by configure.  */
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
- /* Define to 1 if translation of program messages to the user's native
-    language is requested. */
--#define ENABLE_NLS 1
++/* config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* Define to 1 if translation of program messages to the user's native
++   language is requested. */
 +/* #undef ENABLE_NLS 1 */
 +
 +/* The gettext domain we're using */
@@ -22,20 +19,23 @@ index 1811177..7857662 100644
 +/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and
 + * LOCALE_DIR */
 +/* #undef BIND_TEXTDOMAIN 1 */
- 
- /* Define if the GNU dcgettext() function is already present or preinstalled.
-    */
--#define HAVE_DCGETTEXT 1
++
++/* Define if the GNU dcgettext() function is already present or preinstalled.
++   */
 +/* #undef HAVE_DCGETTEXT 1 */
- 
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #define HAVE_DLFCN_H 1
-@@ -21,8 +32,93 @@
- /* Define to 1 if you have the <inttypes.h> header file. */
- #define HAVE_INTTYPES_H 1
- 
--/* Define to 1 if you have the `localtime_r' function. */
--#define HAVE_LOCALTIME_R 1
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define if the GNU gettext() function is already present or preinstalled. */
++#define HAVE_GETTEXT 1
++
++/* Define if you have the iconv() function. */
++#define HAVE_ICONV 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
 +/* Define to 1 if you have the <memory.h> header file. */
 +#define HAVE_MEMORY_H 1
 +
@@ -73,19 +73,19 @@ index 1811177..7857662 100644
 +#define PACKAGE_NAME "EXIF library"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "EXIF library 0.6.20"
++#define PACKAGE_STRING "EXIF library 0.6.21"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "libexif"
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.6.20"
++#define PACKAGE_VERSION "0.6.21"
 +
 +/* Define to 1 if you have the ANSI C header files. */
 +#define STDC_HEADERS 1
 +
 +/* Version number of package */
-+#define VERSION "0.6.20"
++#define VERSION "0.6.21"
 +
 +#elif !defined(__APPLE__)
 +/* config.h.  Generated by configure.  */
@@ -123,14 +123,32 @@ index 1811177..7857662 100644
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#define HAVE_INTTYPES_H 1
- 
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
-@@ -49,11 +145,101 @@
- #define HAVE_UNISTD_H 1
- 
- /* Define as const if the declaration of iconv() needs const. */
--#define ICONV_CONST 
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define as const if the declaration of iconv() needs const. */
 +#define ICONV_CONST
 +
 +/* Name of package */
@@ -143,19 +161,19 @@ index 1811177..7857662 100644
 +#define PACKAGE_NAME "EXIF library"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "EXIF library 0.6.20"
++#define PACKAGE_STRING "EXIF library 0.6.21"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "libexif"
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.6.20"
++#define PACKAGE_VERSION "0.6.21"
 +
 +/* Define to 1 if you have the ANSI C header files. */
 +#define STDC_HEADERS 1
 +
 +/* Version number of package */
-+#define VERSION "0.6.20"
++#define VERSION "0.6.21"
 +
 +/* Define to empty if `const' does not conform to ANSI C. */
 +/* #undef const */
@@ -176,8 +194,7 @@ index 1811177..7857662 100644
 +
 +/* The gettext domain we're using */
 +/* #undef GETTEXT_PACKAGE "libexif-12" */
- 
--/* Define to the sub-directory in which libtool stores uninstalled libraries.
++
 +/* Define locale directory. */
 +/* #undef LOCALEDIR "UTF-8" */
 +
@@ -186,8 +203,7 @@ index 1811177..7857662 100644
 +/* #undef BIND_TEXTDOMAIN 1 */
 +
 +/* Define if the GNU dcgettext() function is already present or preinstalled.
-    */
--#define LT_OBJDIR ".libs/"
++   */
 +/* #undef HAVE_DCGETTEXT */
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
@@ -228,23 +244,30 @@ index 1811177..7857662 100644
 +
 +/* Define as const if the declaration of iconv() needs const. */
 +/* #undef ICONV_CONST */
- 
- /* Name of package */
- #define PACKAGE "libexif"
-@@ -70,8 +256,93 @@
- /* Define to the one symbol short name of this package. */
- #define PACKAGE_TARNAME "libexif"
- 
--/* Define to the home page for this package. */
--#define PACKAGE_URL ""
++
++/* Name of package */
++#define PACKAGE "libexif"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "EXIF library"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "EXIF library 0.6.21"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "libexif"
++
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.6.20"
++#define PACKAGE_VERSION "0.6.21"
 +
 +/* Define to 1 if you have the ANSI C header files. */
 +#define STDC_HEADERS 1
 +
 +/* Version number of package */
-+#define VERSION "0.6.20"
++#define VERSION "0.6.21"
 +
 +/* Define to empty if `const' does not conform to ANSI C. */
 +/* #undef const */
@@ -320,90 +343,67 @@ index 1811177..7857662 100644
 +#define PACKAGE_NAME "EXIF library"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "EXIF library 0.6.20"
++#define PACKAGE_STRING "EXIF library 0.6.21"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "libexif"
- 
- /* Define to the version of this package. */
- #define PACKAGE_VERSION "0.6.20"
-@@ -84,9 +355,6 @@
- 
- /* Define to empty if `const' does not conform to ANSI C. */
- /* #undef const */
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.6.21"
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Version number of package */
++#define VERSION "0.6.21"
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
 +#endif  // TARGET_OS_IPHONE
- 
--/* Define to `__inline__' or `__inline' if that's what the C compiler
--   calls it, or to nothing if 'inline' is not supported under any name.  */
--#ifndef __cplusplus
--/* #undef inline */
--#endif
++
 +#endif  // _WIN32
-diff --git a/third_party/libexif/sources/libexif/_stdint.h b/third_party/libexif/sources/libexif/_stdint.h
-index 80ecf41..0ecf836 100644
---- a/third_party/libexif/sources/libexif/_stdint.h
-+++ b/third_party/libexif/sources/libexif/_stdint.h
-@@ -1,2 +1,15 @@
- /* This file is generated automatically by configure */
-+#if defined(_WIN32)
-+// Define C99 equivalent types.
-+typedef signed char           int8_t;
-+typedef signed short          int16_t;
-+typedef signed int            int32_t;
-+typedef signed long long      int64_t;
-+typedef signed long long      ssize_t;
-+typedef unsigned char         uint8_t;
-+typedef unsigned short        uint16_t;
-+typedef unsigned int          uint32_t;
-+typedef unsigned long long    uint64_t;
-+#else
- #include <stdint.h>
-+#endif
-diff --git a/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c b/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c
-index 6ef73a4..6ced674 100644
---- a/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c
-+++ b/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c
-@@ -160,7 +160,9 @@ mnote_canon_tag_get_title (MnoteCanonTag t)
+diff -urN libexif-0.6.21/libexif/canon/mnote-canon-tag.c libexif-0.6.21.modified/libexif/canon/mnote-canon-tag.c
+--- libexif-0.6.21/libexif/canon/mnote-canon-tag.c	2012-06-19 14:47:28.000000000 -0700
++++ libexif-0.6.21.modified/libexif/canon/mnote-canon-tag.c	2012-07-14 15:51:50.883304000 -0700
+@@ -159,8 +159,9 @@
+ mnote_canon_tag_get_title (MnoteCanonTag t)
  {
  	unsigned int i;
- 
--	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); 
+-
 +#if defined(BIND_TEXTDOMAIN)
-+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); 
 +#endif
  	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
  		if (table[i].tag == t) return (_(table[i].title));
  	return NULL;
-@@ -194,7 +196,9 @@ mnote_canon_tag_get_description (MnoteCanonTag t)
+@@ -194,7 +195,9 @@
  		if (table[i].tag == t) {
- 			if (!*table[i].description)
+ 			if (!table[i].description || !*table[i].description)
  				return "";
--			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 +#if defined(BIND_TEXTDOMAIN)
-+                	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ 			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 +#endif
  			return _(table[i].description);
  		}
  	return NULL;
-diff --git a/third_party/libexif/sources/libexif/exif-entry.c b/third_party/libexif/sources/libexif/exif-entry.c
-index a7edf7a..7f3ae55 100644
---- a/third_party/libexif/sources/libexif/exif-entry.c
-+++ b/third_party/libexif/sources/libexif/exif-entry.c
-@@ -840,7 +840,9 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
+diff -urN libexif-0.6.21/libexif/exif-entry.c libexif-0.6.21.modified/libexif/exif-entry.c
+--- libexif-0.6.21/libexif/exif-entry.c	2012-07-12 11:31:56.000000000 -0700
++++ libexif-0.6.21.modified/libexif/exif-entry.c	2012-07-14 15:52:26.955243000 -0700
+@@ -860,8 +860,9 @@
  	 * 
  	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	 */
 +#if defined(BIND_TEXTDOMAIN)
  	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+-
 +#endif
+ 	if (!e || !e->parent || !e->parent->parent || !maxlen)
+ 		return val;
  
- 	/* make sure the returned string is zero terminated */
- 	memset (val, 0, maxlen);
-diff --git a/third_party/libexif/sources/libexif/exif-format.c b/third_party/libexif/sources/libexif/exif-format.c
-index 2c63c33..08e4f0c 100644
---- a/third_party/libexif/sources/libexif/exif-format.c
-+++ b/third_party/libexif/sources/libexif/exif-format.c
-@@ -61,8 +61,9 @@ exif_format_get_name (ExifFormat format)
+diff -urN libexif-0.6.21/libexif/exif-format.c libexif-0.6.21.modified/libexif/exif-format.c
+--- libexif-0.6.21/libexif/exif-format.c	2009-11-07 22:59:07.000000000 -0800
++++ libexif-0.6.21.modified/libexif/exif-format.c	2012-07-14 15:19:07.203071000 -0700
+@@ -61,8 +61,9 @@
  	 * 
  	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	 */
@@ -414,39 +414,36 @@ index 2c63c33..08e4f0c 100644
  	for (i = 0; ExifFormatTable[i].name; i++)
  		if (ExifFormatTable[i].format == format)
  			return _(ExifFormatTable[i].name);
-diff --git a/third_party/libexif/sources/libexif/exif-mem.c b/third_party/libexif/sources/libexif/exif-mem.c
-index b4d7ece..86f8fc9 100644
---- a/third_party/libexif/sources/libexif/exif-mem.c
-+++ b/third_party/libexif/sources/libexif/exif-mem.c
-@@ -1,3 +1,23 @@
-+ /* exif-mem.c
-+  *
-+  * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net>
-+  *
-+  * This library is free software; you can redistribute it and/or
-+  * modify it under the terms of the GNU Lesser General Public
-+  * License as published by the Free Software Foundation; either
-+  * version 2 of the License, or (at your option) any later version.
-+  *
-+  * This library is distributed in the hope that it will be useful,
-+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+  * Lesser General Public License for more details.
-+  *
-+  * You should have received a copy of the GNU Lesser General Public
-+  * License along with this library; if not, write to the
-+  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+  * Boston, MA  02110-1301  USA.
-+  */
-+
+diff -urN libexif-0.6.21/libexif/exif-mem.c libexif-0.6.21.modified/libexif/exif-mem.c
+--- libexif-0.6.21/libexif/exif-mem.c	2009-09-24 23:35:48.000000000 -0700
++++ libexif-0.6.21.modified/libexif/exif-mem.c	2012-07-14 15:26:44.722234000 -0700
+@@ -1,3 +1,22 @@
++/* exif-mem.c
++ *
++ * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA  02110-1301  USA.
++ */
  #include <libexif/exif-mem.h>
  
  #include <stdlib.h>
-diff --git a/third_party/libexif/sources/libexif/exif-tag.c b/third_party/libexif/sources/libexif/exif-tag.c
-index 9e38849..433d6cc 100644
---- a/third_party/libexif/sources/libexif/exif-tag.c
-+++ b/third_party/libexif/sources/libexif/exif-tag.c
-@@ -990,7 +990,9 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
+diff -urN libexif-0.6.21/libexif/exif-tag.c libexif-0.6.21.modified/libexif/exif-tag.c
+--- libexif-0.6.21/libexif/exif-tag.c	2011-05-18 21:41:02.000000000 -0700
++++ libexif-0.6.21.modified/libexif/exif-tag.c	2012-07-14 15:53:31.642803000 -0700
+@@ -990,7 +990,9 @@
  	 * 
  	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	 */
@@ -456,7 +453,7 @@ index 9e38849..433d6cc 100644
  	return _(ExifTagTable[i].title);
  }
  
-@@ -1024,7 +1026,9 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
+@@ -1024,7 +1026,9 @@
  	 * 
  	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	 */
@@ -466,11 +463,10 @@ index 9e38849..433d6cc 100644
  	return _(ExifTagTable[i].description);
  }
  
-diff --git a/third_party/libexif/sources/libexif/exif-utils.h b/third_party/libexif/sources/libexif/exif-utils.h
-index 7861564..38d0f67 100644
---- a/third_party/libexif/sources/libexif/exif-utils.h
-+++ b/third_party/libexif/sources/libexif/exif-utils.h
-@@ -30,11 +30,12 @@ extern "C" {
+diff -urN libexif-0.6.21/libexif/exif-utils.h libexif-0.6.21.modified/libexif/exif-utils.h
+--- libexif-0.6.21/libexif/exif-utils.h	2009-10-26 23:06:11.000000000 -0700
++++ libexif-0.6.21.modified/libexif/exif-utils.h	2012-07-14 15:27:36.664810000 -0700
+@@ -30,6 +30,7 @@
  #include <libexif/exif-byte-order.h>
  #include <libexif/exif-format.h>
  #include <libexif/_stdint.h>
@@ -478,17 +474,10 @@ index 7861564..38d0f67 100644
  
  
  /* If these definitions don't work for you, please let us fix the 
-  * macro generating _stdint.h */
--	
-+
- /*! EXIF Unsigned Byte data type */
- typedef unsigned char	ExifByte;          /* 1 byte  */
- 	
-diff --git a/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c b/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c
-index 3200eb6..4078037 100644
---- a/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c
-+++ b/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c
-@@ -83,7 +83,9 @@ mnote_fuji_tag_get_title (MnoteFujiTag t)
+diff -urN libexif-0.6.21/libexif/fuji/mnote-fuji-tag.c libexif-0.6.21.modified/libexif/fuji/mnote-fuji-tag.c
+--- libexif-0.6.21/libexif/fuji/mnote-fuji-tag.c	2012-06-19 14:47:28.000000000 -0700
++++ libexif-0.6.21.modified/libexif/fuji/mnote-fuji-tag.c	2012-07-14 15:54:31.132701000 -0700
+@@ -83,7 +83,9 @@
  {
  	unsigned int i;
  
@@ -498,9 +487,9 @@ index 3200eb6..4078037 100644
  	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
  		if (table[i].tag == t) return (_(table[i].title));
  	return NULL;
-@@ -98,7 +100,9 @@ mnote_fuji_tag_get_description (MnoteFujiTag t)
+@@ -98,7 +100,9 @@
  		if (table[i].tag == t) {
- 			if (!*table[i].description)
+ 			if (!table[i].description || !*table[i].description)
  				return "";
 +#if defined(BIND_TEXTDOMAIN)
  			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -508,11 +497,10 @@ index 3200eb6..4078037 100644
  			return _(table[i].description);
  		}
  	return NULL;
-diff --git a/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c b/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c
-index 3810352..af8ffef 100644
---- a/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c
-+++ b/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c
-@@ -208,7 +208,9 @@ mnote_olympus_tag_get_title (MnoteOlympusTag t)
+diff -urN libexif-0.6.21/libexif/olympus/mnote-olympus-tag.c libexif-0.6.21.modified/libexif/olympus/mnote-olympus-tag.c
+--- libexif-0.6.21/libexif/olympus/mnote-olympus-tag.c	2011-05-18 21:41:02.000000000 -0700
++++ libexif-0.6.21.modified/libexif/olympus/mnote-olympus-tag.c	2012-07-14 15:55:36.303176000 -0700
+@@ -208,7 +208,9 @@
  {
  	unsigned int i;
  
@@ -522,7 +510,7 @@ index 3810352..af8ffef 100644
  	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
  		if (table[i].tag == t) return (_(table[i].title));
  	return NULL;
-@@ -223,7 +225,9 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t)
+@@ -223,7 +225,9 @@
  		if (table[i].tag == t) {
  			if (!table[i].description || !*table[i].description)
  				return "";
@@ -532,11 +520,10 @@ index 3810352..af8ffef 100644
  			return _(table[i].description);
  		}
  	return NULL;
-diff --git a/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c b/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c
-index 740f135..b53390f 100644
---- a/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c
-+++ b/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c
-@@ -153,7 +153,9 @@ mnote_pentax_tag_get_title (MnotePentaxTag t)
+diff -urN libexif-0.6.21/libexif/pentax/mnote-pentax-tag.c libexif-0.6.21.modified/libexif/pentax/mnote-pentax-tag.c
+--- libexif-0.6.21/libexif/pentax/mnote-pentax-tag.c	2011-05-18 21:41:02.000000000 -0700
++++ libexif-0.6.21.modified/libexif/pentax/mnote-pentax-tag.c	2012-07-14 15:56:30.122590000 -0700
+@@ -153,7 +153,9 @@
  {
  	unsigned int i;
  
@@ -546,7 +533,7 @@ index 740f135..b53390f 100644
  	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
  		if (table[i].tag == t) return (_(table[i].title));
  	return NULL;
-@@ -168,7 +170,9 @@ mnote_pentax_tag_get_description (MnotePentaxTag t)
+@@ -168,7 +170,9 @@
  		if (table[i].tag == t) {
  			if (!table[i].description || !*table[i].description)
  				return "";
@@ -556,3 +543,22 @@ index 740f135..b53390f 100644
  			return _(table[i].description);
  		}
  	return NULL;
+diff -urN libexif-0.6.21/libexif/_stdint.h libexif-0.6.21.modified/libexif/_stdint.h
+--- libexif-0.6.21/libexif/_stdint.h	2012-07-12 13:34:01.000000000 -0700
++++ libexif-0.6.21.modified/libexif/_stdint.h	2012-07-14 15:30:09.884802000 -0700
+@@ -1,2 +1,15 @@
+ /* This file is generated automatically by configure */
++#if defined(_WIN32)
++// Define C99 equivalent types.
++typedef signed char           int8_t;
++typedef signed short          int16_t;
++typedef signed int            int32_t;
++typedef signed long long      int64_t;
++typedef signed long long      ssize_t;
++typedef unsigned char         uint8_t;
++typedef unsigned short        uint16_t;
++typedef unsigned int          uint32_t;
++typedef unsigned long long    uint64_t;
++#else
+ #include <stdint.h>
++#endif