From 7d5b9e9d65d50fd1e892db9b473a891dd639ce6f Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Wed, 20 Jan 2021 18:22:43 +0100 Subject: [PATCH] metadata: fixed bug in transferring basic tags (cherry picked from commit 89afbd90e154ddd5e6071c44990b68aa62227739) --- rtengine/imagedata.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index 469388b1c..b4058e56e 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -754,7 +754,8 @@ void set_exif(Exiv2::ExifData &exif, const std::string &key, T val) { try { exif[key] = val; - } catch (std::exception &exc) {} + } catch (std::exception &exc) { + } } } // namespace @@ -765,10 +766,10 @@ void FramesData::fillBasicTags(Exiv2::ExifData &exif) const return; } set_exif(exif, "Exif.Photo.ISOSpeedRatings", getISOSpeed()); - set_exif(exif, "Exif.Photo.FNumber", apertureToString(getFNumber())); - set_exif(exif, "Exif.Photo.ExposureTime", shutterToString(getShutterSpeed())); + set_exif(exif, "Exif.Photo.FNumber", Exiv2::DoubleValue(getFNumber())); + set_exif(exif, "Exif.Photo.ExposureTime", Exiv2::DoubleValue(getShutterSpeed())); set_exif(exif, "Exif.Photo.FocalLength", Exiv2::DoubleValue(getFocalLen())); - set_exif(exif, "Exif.Photo.ExposureBiasValue", expcompToString(getExpComp(), false)); + set_exif(exif, "Exif.Photo.ExposureBiasValue", Exiv2::DoubleValue(getExpComp())); set_exif(exif, "Exif.Image.Make", getMake()); set_exif(exif, "Exif.Image.Model", getModel()); set_exif(exif, "Exif.Photo.LensModel", getLens());