Merge branch 'dev' into spot-removal-tool

2021-05-15 22:57:06 -07:00
parent 907da2db96 62996e16b1
commit ca4241109a
57 changed files with 4208 additions and 2488 deletions
--- a/rtengine/imageio.h
+++ b/rtengine/imageio.h
@@ -70,7 +70,6 @@ protected:
    char* profileData;
    int profileLength;
    char* loadedProfileData;
-    bool loadedProfileDataJpg;
    int loadedProfileLength;
    const std::unique_ptr<procparams::ExifPairs> exifChange;
    IptcData* iptc;