libexif: Roll DEPS to rebase to libexif 0.6.21; chromium.patch changes.

BUG=363471

Review URL: https://codereview.chromium.org/243913002

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

3 files changed, 65 insertions, 55 deletions

diff --git a/third_party/libexif/README.chromium b/third_party/libexif/README.chromium
index d8dc543..24043ff 100644
--- a/third_party/libexif/README.chromium
+++ b/third_party/libexif/README.chromium
@@ -4,7 +4,7 @@ Version: 0.6.21
 License: LGPL 2.1
 License File: sources/COPYING
 Date: 2012-06-04
-Security Critical: yes.
+Security Critical: yes
 
 Description:
 libexif is a library for parsing, editing, and saving EXIF data. Many maker
@@ -21,3 +21,5 @@ Local Modifications:
   INSTALL, install-sh, Makefile-files, *.sym, *.am, *.in, *.pc.in, *.spec, *.sh
   and *.txt files.
 - Removed "doc", "po", "NEWS", "mkinstalldirs", "missing", "nls" folders.
+- Removed inline from exif_tag_table_count function in exif_tag.c, to build
+  cleanly with MSVC's non-standard inline rules.
diff --git a/third_party/libexif/chromium.patch b/third_party/libexif/chromium.patch
index 02c9399..79e6a77 100644
--- a/third_party/libexif/chromium.patch
+++ b/third_party/libexif/chromium.patch
@@ -1,6 +1,6 @@
 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
++++ libexif-0.6.21.modified/config.h	1969-12-31 16:00:00.000000000 -0800
 @@ -0,0 +1,360 @@
 +#if defined(_WIN32)
 +/* config.h.  Generated by configure.  */
@@ -363,20 +363,19 @@ diff -urN libexif-0.6.21/config.h libexif-0.6.21.modified/config.h
 +
 +#endif  // _WIN32
 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)
+--- libexif-0.6.21/libexif/canon/mnote-canon-tag.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/canon/mnote-canon-tag.c	1969-12-31 16:00:00.000000000 -0800
+@@ -160,7 +160,9 @@
  {
  	unsigned int i;
--
+ 
 +#if defined(BIND_TEXTDOMAIN)
  	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 +195,9 @@
+@@ -194,7 +196,9 @@
  		if (table[i].tag == t) {
  			if (!table[i].description || !*table[i].description)
  				return "";
@@ -387,62 +386,70 @@ diff -urN libexif-0.6.21/libexif/canon/mnote-canon-tag.c libexif-0.6.21.modified
  		}
  	return NULL;
 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 @@
+--- libexif-0.6.21/libexif/exif-entry.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/exif-entry.c	1969-12-31 16:00:00.000000000 -0800
+@@ -860,7 +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;
- 
 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 @@
+--- libexif-0.6.21/libexif/exif-format.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/exif-format.c	1969-12-31 16:00:00.000000000 -0800
+@@ -61,7 +61,9 @@
  	 * 
  	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	 */
 +#if defined(BIND_TEXTDOMAIN)
  	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
--
 +#endif
+ 
  	for (i = 0; ExifFormatTable[i].name; i++)
  		if (ExifFormatTable[i].format == format)
- 			return _(ExifFormatTable[i].name);
 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.
-+ */
+--- libexif-0.6.21/libexif/exif-mem.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/exif-mem.c	1969-12-31 16:00:00.000000000 -0800
+@@ -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.
++  */
++
  #include <libexif/exif-mem.h>
  
  #include <stdlib.h>
 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
+--- libexif-0.6.21/libexif/exif-tag.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/exif-tag.c	1969-12-31 16:00:00.000000000 -0800
+@@ -877,7 +877,7 @@
+  * Return the number of entries in the EXIF tag table, including the
+  * terminating NULL entry.
+  */
+-inline unsigned int
++unsigned int
+ exif_tag_table_count (void)
+ {
+ 	return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]);
 @@ -990,7 +990,9 @@
  	 * 
  	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -464,19 +471,19 @@ diff -urN libexif-0.6.21/libexif/exif-tag.c libexif-0.6.21.modified/libexif/exif
  }
  
 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>
+--- libexif-0.6.21/libexif/exif-utils.h	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/exif-utils.h	1969-12-31 16:00:00.000000000 -0800
+@@ -31,6 +31,7 @@
  #include <libexif/exif-format.h>
  #include <libexif/_stdint.h>
-+#include "config.h"
  
++#include "config.h"
  
  /* If these definitions don't work for you, please let us fix the 
+  * macro generating _stdint.h */
 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
+--- libexif-0.6.21/libexif/fuji/mnote-fuji-tag.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/fuji/mnote-fuji-tag.c	1969-12-31 16:00:00.000000000 -0800
 @@ -83,7 +83,9 @@
  {
  	unsigned int i;
@@ -498,8 +505,8 @@ diff -urN libexif-0.6.21/libexif/fuji/mnote-fuji-tag.c libexif-0.6.21.modified/l
  		}
  	return NULL;
 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
+--- libexif-0.6.21/libexif/olympus/mnote-olympus-tag.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/olympus/mnote-olympus-tag.c	1969-12-31 16:00:00.000000000 -0800
 @@ -208,7 +208,9 @@
  {
  	unsigned int i;
@@ -521,8 +528,8 @@ diff -urN libexif-0.6.21/libexif/olympus/mnote-olympus-tag.c libexif-0.6.21.modi
  		}
  	return NULL;
 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
+--- libexif-0.6.21/libexif/pentax/mnote-pentax-tag.c	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/pentax/mnote-pentax-tag.c	1969-12-31 16:00:00.000000000 -0800
 @@ -153,7 +153,9 @@
  {
  	unsigned int i;
@@ -544,8 +551,8 @@ diff -urN libexif-0.6.21/libexif/pentax/mnote-pentax-tag.c libexif-0.6.21.modifi
  		}
  	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
+--- libexif-0.6.21/libexif/_stdint.h	1969-12-31 16:00:00.000000000 -0800
++++ libexif-0.6.21.modified/libexif/_stdint.h	1969-12-31 16:00:00.000000000 -0800
 @@ -1,2 +1,15 @@
  /* This file is generated automatically by configure */
 +#if defined(_WIN32)
diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp
index 1b18af0..eebb875 100644
--- a/third_party/libexif/libexif.gyp
+++ b/third_party/libexif/libexif.gyp
@@ -92,6 +92,7 @@
                 'inline=__inline',
               ],
               'msvs_disabled_warnings': [
+                4018, # size/unsigned mismatch
                 4267, # size_t -> ExifLong truncation on amd64
               ],
             }],