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/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1705,7 +1705,7 @@ int RawImageSource::load(const Glib::ustring &fname)
    }


-    // Load complete Exif informations
+    // Load complete Exif information
    std::unique_ptr<RawMetaDataLocation> rml(new RawMetaDataLocation(ri->get_exifBase(), ri->get_ciffBase(), ri->get_ciffLen()));
    idata = new FramesData(fname, std::move(rml));
    idata->setDCRawFrameCount(numFrames);