Fix for declared near() function, backport from ART. Various other minor changes.

2020-10-16 13:30:47 +02:00
parent 9ee48d83f9
commit badf92ba64
6 changed files with 11 additions and 13 deletions
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -68,11 +68,9 @@ const std::string& validateUft8(const std::string& str, const std::string& on_er
    return on_error;
 }

-}
-
-FramesMetaData* FramesMetaData::fromFile(const Glib::ustring& fname, std::unique_ptr<RawMetaDataLocation> rml, bool firstFrameOnly)
+FramesMetaData* FramesMetaData::fromFile(const Glib::ustring& fname)
 {
-    return new FramesData(fname, std::move(rml), firstFrameOnly);
+    return new FramesData(fname);
 }

 FramesData::FramesData(const Glib::ustring &fname) :