Merge branch 'master' into clang-tidy

2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
--- a/rtengine/ffmanager.h
+++ b/rtengine/ffmanager.h
@@ -34,8 +34,6 @@ public:
    std::string maker;  ///< manufacturer
    std::string model;  ///< model
    std::string lens;   ///< lens
-    int iso;            ///< ISO (gain)
-    double shutter;     ///< shutter or exposure time in sec
    double aperture;    ///< aperture in stops
    double focallength; ///< focal length in mm
    time_t timestamp;   ///< seconds since 1 Jan 1970