merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-11-03 17:24:34 +01:00
52 changed files with 324 additions and 339 deletions

View File

@@ -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);