Resolve exiv2 merge conflicts and merge with

2020-10-16 11:45:26 +02:00
parent e093555c66 28f0bc14da
commit 8b4389ade9
49 changed files with 1531 additions and 17588 deletions
--- a/rtgui/thumbnail.h
+++ b/rtgui/thumbnail.h
@@ -82,7 +82,7 @@ class Thumbnail
    void            _loadThumbnail (bool firstTrial = true);
    void            _saveThumbnail ();
    void            _generateThumbnailImage ();
-    int             infoFromImage (const Glib::ustring& fname, std::unique_ptr<rtengine::RawMetaDataLocation> rml = nullptr);
+    int             infoFromImage (const Glib::ustring& fname);
    void            loadThumbnail (bool firstTrial = true);
    void            generateExifDateTimeStrings ();