Merge branch 'dev' into metadata-exiv2

2021-04-27 09:59:52 +02:00
parent c8ef1ee628 2685e1774c
commit ae754b2492
249 changed files with 22554 additions and 8710 deletions
--- a/rtengine/imageio.h
+++ b/rtengine/imageio.h
@@ -80,7 +80,6 @@ protected:
    std::string profileData;
    int profileLength;
    char* loadedProfileData;
-    bool loadedProfileDataJpg;
    int loadedProfileLength;
    MyMutex imutex;
    IIOSampleFormat sampleFormat;