Merge branch 'dev' into cr3_cleanup

2019-11-28 07:39:00 +01:00
parent 97960f335f 55709bc449
commit 63fa62e0e2
100 changed files with 377 additions and 458 deletions
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@@ -68,6 +68,7 @@ public:
        gamm[0]=0.45;gamm[1]=4.5;gamm[2]=gamm[3]=gamm[4]=gamm[5]=0;
        user_mul[0]=user_mul[1]=user_mul[2]=user_mul[3]=0;
        greybox[0]=greybox[1]=0; greybox[2]=greybox[3]= UINT_MAX;
+        RT_canon_CR3_data.CR3_CTMDtag = 0;
    }

 protected: