merge with dev

2018-11-03 17:24:34 +01:00
parent 19d71e46d4 eef2c5f959
commit aef2ad47e3
52 changed files with 324 additions and 339 deletions
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -2225,7 +2225,7 @@ bool Thumbnail::readAEHistogram  (const Glib::ustring& fname)
    FILE* f = g_fopen (fname.c_str (), "rb");

    if (!f) {
-        aeHistogram (0);
+        aeHistogram.reset();
    } else {
        aeHistogram (65536 >> aeHistCompression);
        fread (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f);