[GNUnet-SVN] r8422 - Extractor/src/plugins/exiv2

[gnunet]

Author: grothoff
Date: 2009-04-12 12:02:27 -0600 (Sun, 12 Apr 2009)
New Revision: 8422

Modified:
   Extractor/src/plugins/exiv2/exiv2extractor.cc
Log:
Hi Christian

In my testing of exiv2extractor.cc when linking with the system libexiv2,
with the symbol SUPPRESS_WARNINGS undefined, I found exceptions were being
thrown, due to the names of some of the tags changing since 0.7. Here are
the changes required:

--- exiv2extractor.cc    2009-04-11 17:47:27.000000000 -0700
+++ exiv2extractor.cc    2009-04-12 10:35:09.000000000 -0700
@@ -189,7 +188,7 @@
         // Flash bias
         // Todo: Implement this for other cameras
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs2.FlashBias",
+                                "Exif.CanonSi.FlashBias",
                                 EXTRACTOR_FLASH_BIAS,
                                 result);
         if (newResult == result) {
@@ -273,7 +272,7 @@
         // Macro mode
         // Todo: Implement this for other cameras
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs1.Macro",
+                                "Exif.CanonCs.Macro",
                                 EXTRACTOR_MACRO_MODE,
                                 result);
         if (newResult == result) {
@@ -299,7 +298,7 @@
         // Image quality setting (compression)
         // Todo: Implement this for other cameras
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs1.Quality",
+                                "Exif.CanonCs.Quality",
                                 EXTRACTOR_IMAGE_QUALITY,
                                 result);
         if (newResult == result) {
@@ -369,7 +368,7 @@
         // Todo: Implement this for other cameras
 
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs2.WhiteBalance",
+                                "Exif.CanonSi.WhiteBalance",
                                 EXTRACTOR_WHITE_BALANCE,
                                 result);
         if (newResult == result) {

Thanks for the help!

Dave


Modified: Extractor/src/plugins/exiv2/exiv2extractor.cc
===================================================================
--- Extractor/src/plugins/exiv2/exiv2extractor.cc       2009-04-12 02:47:09 UTC 
(rev 8421)
+++ Extractor/src/plugins/exiv2/exiv2extractor.cc       2009-04-12 18:02:27 UTC 
(rev 8422)
@@ -189,7 +189,7 @@
         // Flash bias
         // Todo: Implement this for other cameras
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs2.FlashBias",
+                                "Exif.CanonSi.FlashBias",
                                 EXTRACTOR_FLASH_BIAS,
                                 result);
         if (newResult == result) {
@@ -299,7 +299,7 @@
         // Image quality setting (compression)
         // Todo: Implement this for other cameras
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs1.Quality",
+                                "Exif.CanonCs.Quality",
                                 EXTRACTOR_IMAGE_QUALITY,
                                 result);
         if (newResult == result) {
@@ -369,7 +369,7 @@
         // Todo: Implement this for other cameras
 
         newResult = addExiv2Tag(exifData,
-                                "Exif.CanonCs2.WhiteBalance",
+                                "Exif.CanonSi.WhiteBalance",
                                 EXTRACTOR_WHITE_BALANCE,
                                 result);
         if (newResult == result) {