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

[gnunet]

Author: grothoff
Date: 2009-04-13 13:23:45 -0600 (Mon, 13 Apr 2009)
New Revision: 8424

Modified:
   Extractor/src/plugins/exiv2/exiv2extractor.cc
Log:
more

Modified: Extractor/src/plugins/exiv2/exiv2extractor.cc
===================================================================
--- Extractor/src/plugins/exiv2/exiv2extractor.cc       2009-04-12 18:47:34 UTC 
(rev 8423)
+++ Extractor/src/plugins/exiv2/exiv2extractor.cc       2009-04-13 19:23:45 UTC 
(rev 8424)
@@ -41,6 +41,8 @@
 #include <pthread.h>
 #endif
 
+#define SUPPRESS_WARNINGS 1
+
 extern "C" {
 
     static struct EXTRACTOR_Keywords * addKeyword(EXTRACTOR_KeywordType type,
@@ -226,7 +228,7 @@
                                 result);
         if (newResult == result) {
             newResult = addExiv2Tag(exifData,
-                                    "Exif.CanonCs1.ISOSpeed",
+                                    "Exif.CanonSi.ISOSpeed",
                                     EXTRACTOR_ISO_SPEED,
                                     result);
         }
@@ -258,7 +260,7 @@
                                 result);
         if (newResult == result) {
             newResult = addExiv2Tag(exifData,
-                                    "Exif.CanonCs1.ExposureProgram",
+                                    "Exif.CanonCs.ExposureProgram",
                                     EXTRACTOR_EXPOSURE_MODE,
                                     result);
         }
@@ -273,7 +275,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) {