From a19f3484ddcbc48c31f80d975b155717e478d8eb Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 20 Nov 2018 20:32:36 +0100 Subject: [PATCH] Fix some warnings --- rtengine/iimage.h | 8 ++++---- rtengine/rtthumbnail.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rtengine/iimage.h b/rtengine/iimage.h index c25425b7d..5738b4655 100644 --- a/rtengine/iimage.h +++ b/rtengine/iimage.h @@ -1136,19 +1136,19 @@ public: void readData (FILE *f) { for (int i = 0; i < height; i++) { - if (fread(r(i), sizeof(T), width, f) < width) { + if (fread(r(i), sizeof(T), width, f) < static_cast(width)) { break; } } for (int i = 0; i < height; i++) { - if (fread(g(i), sizeof(T), width, f) < width) { + if (fread(g(i), sizeof(T), width, f) < static_cast(width)) { break; } } for (int i = 0; i < height; i++) { - if (fread(b(i), sizeof(T), width, f) < width) { + if (fread(b(i), sizeof(T), width, f) < static_cast(width)) { break; } } @@ -1718,7 +1718,7 @@ public: void readData (FILE *f) { for (int i = 0; i < height; i++) { - if (fread(r(i), sizeof(T), 3 * width, f) < 3 * width) { + if (fread(r(i), sizeof(T), 3 * width, f) < 3 * static_cast(width)) { break; } } diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc index fe5fb9b86..0ca2c24ec 100644 --- a/rtengine/rtthumbnail.cc +++ b/rtengine/rtthumbnail.cc @@ -2237,7 +2237,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();