summaryrefslogtreecommitdiff
path: root/src/jpeg-utils.cpp
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2013-03-16 21:10:55 +0100
committerTomas Bzatek <tbzatek@users.sourceforge.net>2013-03-16 21:10:55 +0100
commit63771101e134b9065b6673a8b70b8d4014d359e9 (patch)
tree8661997fb350b986e21f72c553c130d1ca4b487b /src/jpeg-utils.cpp
parentc5cb4c32d746fd0e0648b386f5528fee7e39b731 (diff)
downloadcataract-63771101e134b9065b6673a8b70b8d4014d359e9.tar.xz
Add support for writing external EXIF metadata back to images
Turned off by default, this will copy all data from supplied external EXIF metadata file back to all generated image files. All user overrides are still applied on top of it. Another reason for turning this off is file size concern, target image files would carry a lot more information that may not be always needed and would increase total amount of data transferred.
Diffstat (limited to 'src/jpeg-utils.cpp')
-rw-r--r--src/jpeg-utils.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp
index 6483563..321a9b6 100644
--- a/src/jpeg-utils.cpp
+++ b/src/jpeg-utils.cpp
@@ -129,6 +129,7 @@ exif_data_free (ExifData *data)
{
if (data) {
g_free (data->override_copyright);
+ g_free (data->external_exif_data);
/* FIXME: free data->priv->image */
g_free (data->priv);
g_free (data);
@@ -663,6 +664,18 @@ modify_exif (const gchar *filename, ExifData *exif, gboolean strip_thumbnail)
g_assert (image.get() != 0);
image->readMetadata();
+
+ /* Write down metadata from external file if supplied */
+ if (exif && exif->external_exif_data) {
+ Exiv2::Image::AutoPtr ext_image = Exiv2::ImageFactory::open (exif->external_exif_data);
+ if (ext_image.get() != 0) {
+ ext_image->clearMetadata();
+ ext_image->readMetadata();
+ image->setMetadata (*ext_image);
+ modified = TRUE;
+ }
+ }
+
Exiv2::ExifData &exifData = image->exifData();
Exiv2::IptcData &iptcData = image->iptcData();