merge with dev

2018-02-15 16:57:23 +01:00
parent 96c49a3086 20fcffae94
commit 9916cdb4b0
61 changed files with 201 additions and 4414 deletions
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -215,7 +215,7 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
        // Focus distance from EXIF or XMP. MakerNote ones are scattered and partly encrypted
        int num = -3, denom = -3;

-        // First try, offical EXIF. Set by Adobe on some DNGs
+        // First try, official EXIF. Set by Adobe on some DNGs
        tag = exif->getTag("SubjectDistance");

        if (tag) {