liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed compilation error with Apple Clang 7.0.0

Browse Source 
(cherry picked from commit dd5b10d9dc8eb7447e37ac30ddd7545897c878b0)
This commit is contained in:
Alberto Griggio 2020-04-20 07:32:55 -07:00 committed by Lawrence Lee
parent 38eb9f9f18
commit 30e77ee96f
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtengine/metadata.cc
View File

@ -76,7 +76,8 @@ std::unique_ptr<Exiv2::Image> open_exiv2(const Glib::ustring& fname)
#endif #endif
throw Exiv2::Error(error_code, "exiv2: invalid image"); throw Exiv2::Error(error_code, "exiv2: invalid image");
} }
return image; std::unique_ptr<Exiv2::Image> ret(image.release());
return ret;
} }
} // namespace } // namespace

2
rtgui/exifpanel.cc
View File

@ -632,7 +632,7 @@ void ExifPanel::onEditExifTagValue(const Glib::ustring &path, const Glib::ustrin
auto row = *it; auto row = *it;
std::string key = row[exifColumns.key]; std::string key = row[exifColumns.key];
changeList[key] = value; (*changeList)[key] = value;
if (!all_keys_active()) { if (!all_keys_active()) {
cur_active_keys_.insert(key); cur_active_keys_.insert(key);
} }