Merge branch 'dev' into newlocallab

2018-11-21 02:58:27 +01:00
parent 721972ee72 ead059ee8c
commit 32b48021a6
42 changed files with 1196 additions and 1799 deletions
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -2238,7 +2238,7 @@ bool Thumbnail::readAEHistogram  (const Glib::ustring& fname)
    } else {
        aeHistogram(65536 >> aeHistCompression);
        const size_t histoBytes = (65536 >> aeHistCompression) * sizeof(aeHistogram[0]);
-        const int bytesRead = fread(&aeHistogram[0], 1, histoBytes, f);
+        const size_t bytesRead = fread(&aeHistogram[0], 1, histoBytes, f);
        fclose (f);
        if (bytesRead != histoBytes) {
            aeHistogram.reset();