merge with dev

2019-11-06 13:38:35 +01:00 · 2019-11-06 13:38:35 +01:00 · 179a09d46b
commit 179a09d46b
parent 32c7d6fb4b a2d5ef356c
1 changed files with 1 additions and 2 deletions
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@ -167,8 +167,7 @@ protected:

    float cam_mul[4], pre_mul[4], cmatrix[3][4], rgb_cam[3][4];

-    int histogram[4][0x2000];
-    void (DCraw::*write_thumb)(), (DCraw::*write_fun)();
+    void (DCraw::*write_thumb)();
    void (DCraw::*load_raw)(), (DCraw::*thumb_load_raw)();
    jmp_buf failure;