commit 4e45bbc8585504e0d970862293a6f4aecb4d0dde
parent 150c194509fad35357481e3c3f558cc8e22398bb
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 13 Apr 2009 19:23:45 +0000
more
Diffstat:
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/exiv2/exiv2extractor.cc b/src/plugins/exiv2/exiv2extractor.cc
@@ -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 @@ extern "C" {
result);
if (newResult == result) {
newResult = addExiv2Tag(exifData,
- "Exif.CanonCs1.ISOSpeed",
+ "Exif.CanonSi.ISOSpeed",
EXTRACTOR_ISO_SPEED,
result);
}
@@ -258,7 +260,7 @@ extern "C" {
result);
if (newResult == result) {
newResult = addExiv2Tag(exifData,
- "Exif.CanonCs1.ExposureProgram",
+ "Exif.CanonCs.ExposureProgram",
EXTRACTOR_EXPOSURE_MODE,
result);
}
@@ -273,7 +275,7 @@ extern "C" {
// Macro mode
// Todo: Implement this for other cameras
newResult = addExiv2Tag(exifData,
- "Exif.CanonCs1.Macro",
+ "Exif.CanonCs.Macro",
EXTRACTOR_MACRO_MODE,
result);
if (newResult == result) {