From 23c1cda99d8ea0ea324b3dd29a89353d17406c44 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Tue, 20 Apr 2021 14:01:44 +0100 Subject: [PATCH] Fix signed/unsigned compiler warnings. --- src/jp2image.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jp2image.cpp b/src/jp2image.cpp index 2689c473..a60a136a 100644 --- a/src/jp2image.cpp +++ b/src/jp2image.cpp @@ -683,7 +683,7 @@ static void boxes_check(size_t b,size_t m) const char* pad = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid"; uint32_t psize = 15; newlen = sizeof(newBox) + psize ; - enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + enforce(newlen <= static_cast(output.size_ - outlen), Exiv2::kerCorruptedMetadata); ul2Data((byte*)&newBox.length,psize ,bigEndian); ul2Data((byte*)&newBox.type ,newBox.type,bigEndian); ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox)); @@ -692,7 +692,7 @@ static void boxes_check(size_t b,size_t m) const char* pad = "\x02\x00\x00"; uint32_t psize = 3; newlen = sizeof(newBox) + psize + iccProfile_.size_; - enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + enforce(newlen <= static_cast(output.size_ - outlen), Exiv2::kerCorruptedMetadata); ul2Data((byte*)&newBox.length,newlen,bigEndian); ul2Data((byte*)&newBox.type,newBox.type,bigEndian); ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox) ); @@ -700,7 +700,7 @@ static void boxes_check(size_t b,size_t m) ::memcpy(output.pData_+outlen+sizeof(newBox)+psize,iccProfile_.pData_,iccProfile_.size_); } } else { - enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + enforce(newlen <= static_cast(output.size_ - outlen), Exiv2::kerCorruptedMetadata); ::memcpy(output.pData_+outlen,boxBuf.pData_+inlen,subBox.length); }