merge with dev

2018-11-11 10:02:38 +01:00
parent fd720007c2 757c1da292
commit 333ac99532
10 changed files with 885 additions and 24 deletions
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -161,6 +161,13 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
        model = "Unknown";
    }

+    if (model == "Unknown") {
+        tag = newFrameRootDir->findTag("UniqueCameraModel");
+        if (tag) {
+            model = tag->valueToString();
+        }
+    }
+
    tag = newFrameRootDir->findTagUpward("Orientation");

    if (tag) {