From 30e77ee96fa83c0a593568cdcacbdedc2e6746b6 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Mon, 20 Apr 2020 07:32:55 -0700
Subject: [PATCH] fixed compilation error with Apple Clang 7.0.0

(cherry picked from commit dd5b10d9dc8eb7447e37ac30ddd7545897c878b0)
---
 rtengine/metadata.cc | 3 ++-
 rtgui/exifpanel.cc   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rtengine/metadata.cc b/rtengine/metadata.cc
index 884c8a9a1..732133785 100644
--- a/rtengine/metadata.cc
+++ b/rtengine/metadata.cc
@@ -76,7 +76,8 @@ std::unique_ptr<Exiv2::Image> open_exiv2(const Glib::ustring& fname)
 #endif
         throw Exiv2::Error(error_code, "exiv2: invalid image");
     }
-    return image;
+    std::unique_ptr<Exiv2::Image> ret(image.release());
+    return ret;
 }
 
 } // namespace
diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index c44a4f8d2..44c70bc12 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -632,7 +632,7 @@ void ExifPanel::onEditExifTagValue(const Glib::ustring &path, const Glib::ustrin
     auto row = *it;
     std::string key = row[exifColumns.key];
 
-    changeList[key] = value;
+    (*changeList)[key] = value;
     if (!all_keys_active()) {
         cur_active_keys_.insert(key);
     }