merge with dev

This commit is contained in:
Desmis 2019-11-06 13:38:35 +01:00
commit 179a09d46b

View File

@ -167,8 +167,7 @@ protected:
float cam_mul[4], pre_mul[4], cmatrix[3][4], rgb_cam[3][4]; float cam_mul[4], pre_mul[4], cmatrix[3][4], rgb_cam[3][4];
int histogram[4][0x2000]; void (DCraw::*write_thumb)();
void (DCraw::*write_thumb)(), (DCraw::*write_fun)();
void (DCraw::*load_raw)(), (DCraw::*thumb_load_raw)(); void (DCraw::*load_raw)(), (DCraw::*thumb_load_raw)();
jmp_buf failure; jmp_buf failure;