Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: libexif/sources/libexif/canon/mnote-canon-entry.c

Issue 10792004: Fetch libexif 0.6.21 to include the security fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « libexif/sources/config.h ('k') | libexif/sources/libexif/canon/mnote-canon-tag.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* mnote-canon-entry.c 1 /* mnote-canon-entry.c
2 * 2 *
3 * Copyright (c) 2002 Lutz Mueller <lutz@users.sourceforge.net> 3 * Copyright (c) 2002 Lutz Mueller <lutz@users.sourceforge.net>
4 * Copyright (c) 2003 Matthieu Castet <mat-c@users.sourceforge.net> 4 * Copyright (c) 2003 Matthieu Castet <mat-c@users.sourceforge.net>
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 {21, 10, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")}, 209 {21, 10, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")},
210 {21, 11, N_("Canon EF 35mm f/2")}, 210 {21, 11, N_("Canon EF 35mm f/2")},
211 {21, 13, N_("Canon EF 15mm f/2.8")}, 211 {21, 13, N_("Canon EF 15mm f/2.8")},
212 {21, 21, N_("Canon EF 80-200mm f/2.8L")}, 212 {21, 21, N_("Canon EF 80-200mm f/2.8L")},
213 {21, 22, N_("Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical")}, 213 {21, 22, N_("Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical")},
214 {21, 26, N_("Cosina 100mm f/3.5 Macro AF")}, 214 {21, 26, N_("Cosina 100mm f/3.5 Macro AF")},
215 {21, 28, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")}, 215 {21, 28, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")},
216 {21, 29, N_("Canon EF 50mm f/1.8 MkII")}, 216 {21, 29, N_("Canon EF 50mm f/1.8 MkII")},
217 {21, 31, N_("Tamron SP AF 300mm f/2.8 LD IF")}, 217 {21, 31, N_("Tamron SP AF 300mm f/2.8 LD IF")},
218 {21, 32, N_("Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye")}, 218 {21, 32, N_("Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye")},
219 {21, 37, N_("Canon EF 35-80mm f/4-5.6")},
219 {21, 39, N_("Canon EF 75-300mm f/4-5.6")}, 220 {21, 39, N_("Canon EF 75-300mm f/4-5.6")},
220 {21, 40, N_("Canon EF 28-80mm f/3.5-5.6")}, 221 {21, 40, N_("Canon EF 28-80mm f/3.5-5.6")},
221 {21, 43, N_("Canon EF 28-105mm f/4-5.6")}, 222 {21, 43, N_("Canon EF 28-105mm f/4-5.6")},
222 {21, 45, N_("Canon EF-S 18-55mm f/3.5-5.6")}, 223 {21, 45, N_("Canon EF-S 18-55mm f/3.5-5.6")},
224 {21, 52, N_("Canon EF-S 18-55mm f/3.5-5.6 IS II")},
223 {21, 124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")}, 225 {21, 124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")},
224 {21, 125, N_("Canon TS-E 24mm f/3.5L")}, 226 {21, 125, N_("Canon TS-E 24mm f/3.5L")},
225 {21, 126, N_("Canon TS-E 45mm f/2.8")}, 227 {21, 126, N_("Canon TS-E 45mm f/2.8")},
226 {21, 127, N_("Canon TS-E 90mm f/2.8")}, 228 {21, 127, N_("Canon TS-E 90mm f/2.8")},
227 {21, 130, N_("Canon EF 50mm f/1.0L")}, 229 {21, 130, N_("Canon EF 50mm f/1.0L")},
228 {21, 131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")}, 230 {21, 131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")},
229 {21, 134, N_("Canon EF 600mm f/4L IS")}, 231 {21, 134, N_("Canon EF 600mm f/4L IS")},
230 {21, 135, N_("Canon EF 200mm f/1.8L")}, 232 {21, 135, N_("Canon EF 200mm f/1.8L")},
231 {21, 136, N_("Canon EF 300mm f/2.8L")}, 233 {21, 136, N_("Canon EF 300mm f/2.8L")},
232 {21, 137, N_("Canon EF 85mm f/1.2L")}, 234 {21, 137, N_("Canon EF 85mm f/1.2L")},
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 {21, 230, N_("Canon EF 24-70mm f/2.8L")}, 277 {21, 230, N_("Canon EF 24-70mm f/2.8L")},
276 {21, 231, N_("Canon EF 17-40mm f/4L")}, 278 {21, 231, N_("Canon EF 17-40mm f/4L")},
277 {21, 232, N_("Canon EF 70-300mm f/4.5-5.6 DO IS USM")}, 279 {21, 232, N_("Canon EF 70-300mm f/4.5-5.6 DO IS USM")},
278 {21, 234, N_("Canon EF-S 17-85mm f4-5.6 IS USM")}, 280 {21, 234, N_("Canon EF-S 17-85mm f4-5.6 IS USM")},
279 {21, 235, N_("Canon EF-S10-22mm F3.5-4.5 USM")}, 281 {21, 235, N_("Canon EF-S10-22mm F3.5-4.5 USM")},
280 {21, 236, N_("Canon EF-S60mm F2.8 Macro USM")}, 282 {21, 236, N_("Canon EF-S60mm F2.8 Macro USM")},
281 {21, 237, N_("Canon EF 24-105mm f/4L IS")}, 283 {21, 237, N_("Canon EF 24-105mm f/4L IS")},
282 {21, 238, N_("Canon EF 70-300mm F4-5.6 IS USM")}, 284 {21, 238, N_("Canon EF 70-300mm F4-5.6 IS USM")},
283 {21, 241, N_("Canon EF 50mm F1.2L USM")}, 285 {21, 241, N_("Canon EF 50mm F1.2L USM")},
284 {21, 242, N_("Canon EF 70-200mm f/4L IS USM")}, 286 {21, 242, N_("Canon EF 70-200mm f/4L IS USM")},
287 {21, 251, N_("Canon EF 70-200mm f/2.8L IS II USM")},
285 {28, 0, N_("Manual")}, 288 {28, 0, N_("Manual")},
286 {28, 1, N_("TTL")}, 289 {28, 1, N_("TTL")},
287 {28, 2, N_("A-TTL")}, 290 {28, 2, N_("A-TTL")},
288 {28, 3, N_("E-TTL")}, 291 {28, 3, N_("E-TTL")},
289 {28, 4, N_("FP sync enabled")}, 292 {28, 4, N_("FP sync enabled")},
290 {28, 7, N_("2nd-curtain sync used")}, 293 {28, 7, N_("2nd-curtain sync used")},
291 {28, 11, N_("FP sync used")}, 294 {28, 11, N_("FP sync used")},
292 {28, 13, N_("Internal")}, 295 {28, 13, N_("Internal")},
293 {28, 14, N_("External")}, 296 {28, 14, N_("External")},
294 {31, 0, N_("Single")}, 297 {31, 0, N_("Single")},
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 printf ("Value%d=%d\n", i, vs); 753 printf ("Value%d=%d\n", i, vs);
751 } 754 }
752 else if (entry->format == EXIF_FORMAT_ASCII) 755 else if (entry->format == EXIF_FORMAT_ASCII)
753 strncpy (val, data, MIN (entry->size, maxlen)); 756 strncpy (val, data, MIN (entry->size, maxlen));
754 } 757 }
755 #endif 758 #endif
756 break; 759 break;
757 } 760 }
758 return val; 761 return val;
759 } 762 }
OLDNEW
« no previous file with comments | « libexif/sources/config.h ('k') | libexif/sources/libexif/canon/mnote-canon-tag.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698