Author: post
Date: 2011-02-23 22:47:31 +0100 (Wed, 23 Feb 2011)
New Revision: 3830
Modified:
trunk/plugins/load-gdk/exiv2-colorspace.cpp
trunk/plugins/meta-exiv2/exiv2-metadata.cpp
Log:
Support legacy Exiv2 versions.
Modified: trunk/plugins/load-gdk/exiv2-colorspace.cpp
===================================================================
--- trunk/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-22 21:28:32 UTC (rev
3829)
+++ trunk/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-23 21:47:31 UTC (rev
3830)
@@ -22,7 +22,6 @@
#include <iomanip>
#include <exiv2/image.hpp>
#include <exiv2/exif.hpp>
-#include <exiv2/easyaccess.hpp>
#include <assert.h>
#include "exiv2-colorspace.h"
#include <math.h>
@@ -38,6 +37,7 @@
#include <exiv2/convert.hpp>
#endif
+
extern "C" {
/** INTERFACE **/
@@ -156,10 +156,12 @@
ExifData &exifData = img->exifData();
*linear_guess = FALSE;
+#if EXIV2_TEST_VERSION(0,17,0)
if (exifData.empty() && !img->xmpData().empty())
{
copyXmpToExif(img->xmpData(), exifData);
}
+#endif
/* Parse Exif Data */
if (!exifData.empty())
Modified: trunk/plugins/meta-exiv2/exiv2-metadata.cpp
===================================================================
--- trunk/plugins/meta-exiv2/exiv2-metadata.cpp 2011-02-22 21:28:32 UTC (rev
3829)
+++ trunk/plugins/meta-exiv2/exiv2-metadata.cpp 2011-02-23 21:47:31 UTC (rev
3830)
@@ -22,7 +22,6 @@
#include <iomanip>
#include <exiv2/image.hpp>
#include <exiv2/exif.hpp>
-#include <exiv2/easyaccess.hpp>
#include <assert.h>
#include "exiv2-metadata.h"
#include <math.h>
@@ -36,6 +35,10 @@
#include <exiv2/convert.hpp>
#endif
+#if EXIV2_TEST_VERSION(0,19,0)
+#include <exiv2/easyaccess.hpp>
+#endif
+
extern "C" {
/** INTERFACE **/
@@ -93,12 +96,14 @@
try {
Image::AutoPtr img =
ImageFactory::open((byte*)raw_get_map(rawfile), raw_get_filesize(rawfile));
img->readMetadata();
- XmpData &xmpData = img->xmpData();
ExifData &exifData = img->exifData();
+#if EXIV2_TEST_VERSION(0,17,0)
/* We perfer XMP data, so copy it to EXIF */
+ XmpData &xmpData = img->xmpData();
if (!xmpData.empty())
copyXmpToExif(xmpData, exifData);
+#endif
/* Parse Exif Data */
if (!exifData.empty())
@@ -112,6 +117,7 @@
if (i != exifData.end())
meta->model_ascii =
g_strdup(i->toString().c_str());
+#if EXIV2_TEST_VERSION(0,19,0)
i = orientation(exifData);
if (i != exifData.end())
{
@@ -123,6 +129,7 @@
break;
}
}
+#endif
i =
exifData.findKey(ExifKey("Exif.Image.DateTimeOriginal"));
if (i == exifData.end())
@@ -163,6 +170,7 @@
if (i != exifData.end())
meta->focallength = i->toFloat()-0.01;
+#if EXIV2_TEST_VERSION(0,19,0)
i = isoSpeed(exifData);
if (i != exifData.end())
meta->iso = i->toLong();
@@ -171,6 +179,7 @@
i = lensName(exifData);
if (i != exifData.end())
meta->fixed_lens_identifier =
g_strdup(i->toString().c_str());
+#endif
/* TODO: Add min/max focal on supported cameras */
return TRUE;
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
