Author: post
Date: 2010-12-07 18:03:46 +0100 (Tue, 07 Dec 2010)
New Revision: 3675
Modified:
trunk/librawstudio/rs-exif.cc
Log:
Insert missing include and guard for old exiv2 versions.
Modified: trunk/librawstudio/rs-exif.cc
===================================================================
--- trunk/librawstudio/rs-exif.cc 2010-12-07 08:35:51 UTC (rev 3674)
+++ trunk/librawstudio/rs-exif.cc 2010-12-07 17:03:46 UTC (rev 3675)
@@ -30,8 +30,10 @@
( EXIV2_VERSION >= EXIV2_MAKE_VERSION((major),(minor),(patch)) )
#endif
+#if EXIV2_TEST_VERSION(0,17,0)
+#include <exiv2/convert.hpp>
+#endif
-
extern "C" {
#include <rawstudio.h>
#include "config.h"
@@ -180,13 +182,15 @@
Exiv2::Image::AutoPtr image =
Exiv2::ImageFactory::open(filename);
/* Copy EXIF to XMP */
+#if EXIV2_TEST_VERSION(0,17,0)
Exiv2::XmpData xmp;
Exiv2::copyExifToXmp(*data, xmp);
+ image->setXmpData(xmp);
+#endif
/* Set new metadata on output image and save */
image->setExifData(*data);
image->setIptcData(iptc_data);
- image->setXmpData(xmp);
image->writeMetadata();
}
catch (Exiv2::AnyError& e)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
