Merge pull request #751 from LebedevRI/clang-19

LebedevRI · web-flow · commit f7c0818d8151 · 2024-09-14T19:24:18.000+03:00
Clang 19 build fixes
diff --git a/fuzz/librawspeed/decompressors/UncompressedDecompressor.cpp b/fuzz/librawspeed/decompressors/UncompressedDecompressor.cpp
@@ -57,7 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
       case static_cast<int>(rawspeed::BitOrder::JPEG):
         return rawspeed::BitOrder(val);
       default:
-        ThrowRSE("Unknown bit order: %u", val);
+        ThrowRSE("Unknown bit order: %i", val);
       }
       __builtin_unreachable();
     }();
diff --git a/src/librawspeed/codes/AbstractPrefixCodeTranscoder.h b/src/librawspeed/codes/AbstractPrefixCodeTranscoder.h
@@ -93,7 +93,7 @@ template <typename CodeTag> class AbstractPrefixCodeTranscoder {
 
   bool operator==(const AbstractPrefixCodeTranscoder& other) const {
     return code.symbols == other.code.symbols &&
-           code.Base::codeValues == other.codeValues;
+           code.Base::codeValues == other.code.Base::codeValues;
   }
 };
 
diff --git a/src/librawspeed/common/DngOpcodes.cpp b/src/librawspeed/common/DngOpcodes.cpp
@@ -212,7 +212,7 @@ class DngOpcodes::ROIOpcode : public DngOpcodes::DngOpcode {
     if (!(subImage.isPointInsideInclusive(topLeft) &&
           subImage.isPointInsideInclusive(bottomRight) &&
           bottomRight >= topLeft)) {
-      ThrowRDE("Rectangle (%u, %u, %u, %u) not inside image (%u, %u, %u, %u).",
+      ThrowRDE("Rectangle (%d, %d, %d, %d) not inside image (%d, %d, %d, %d).",
                topLeft.x, topLeft.y, bottomRight.x, bottomRight.y,
                subImage.getTopLeft().x, subImage.getTopLeft().y,
                subImage.getBottomRight().x, subImage.getBottomRight().y);
@@ -702,7 +702,7 @@ DngOpcodes::DngOpcodes(const RawImage& ri, ByteStream bs) {
     if (auto Op = Map(code))
       std::tie(opName, opConstructor) = *Op;
     else
-      ThrowRDE("Unknown unhandled Opcode: %d", code);
+      ThrowRDE("Unknown unhandled Opcode: %u", code);
 
     if (opConstructor != nullptr)
       opcodes.emplace_back(opConstructor(ri, opcode_bs, integrated_subimg));
@@ -711,7 +711,7 @@ DngOpcodes::DngOpcodes(const RawImage& ri, ByteStream bs) {
       // Throw Error if not marked as optional
       if (!(flags & 1))
 #endif
-        ThrowRDE("Unsupported Opcode: %d (%s)", code, opName);
+        ThrowRDE("Unsupported Opcode: %u (%s)", code, opName);
     }
 
     if (opcode_bs.getRemainSize() != 0)
diff --git a/src/librawspeed/common/RawImage.cpp b/src/librawspeed/common/RawImage.cpp
@@ -155,7 +155,7 @@ void RawImageData::setCpp(uint32_t val) {
     ThrowRDE("Attempted to set Components per pixel after data allocation");
   if (val > 4) {
     ThrowRDE(
-        "Only up to 4 components per pixel is support - attempted to set: %d",
+        "Only up to 4 components per pixel is support - attempted to set: %u",
         val);
   }
 
diff --git a/src/librawspeed/decoders/ArwDecoder.cpp b/src/librawspeed/decoders/ArwDecoder.cpp
@@ -613,14 +613,14 @@ void ArwDecoder::GetWB() const {
     if (encryptedIFD.hasEntry(TiffTag::SONYGRBGLEVELS)) {
       const TiffEntry* wb = encryptedIFD.getEntry(TiffTag::SONYGRBGLEVELS);
       if (wb->count != 4)
-        ThrowRDE("WB has %d entries instead of 4", wb->count);
+        ThrowRDE("WB has %u entries instead of 4", wb->count);
       mRaw->metadata.wbCoeffs[0] = wb->getFloat(1);
       mRaw->metadata.wbCoeffs[1] = wb->getFloat(0);
       mRaw->metadata.wbCoeffs[2] = wb->getFloat(2);
     } else if (encryptedIFD.hasEntry(TiffTag::SONYRGGBLEVELS)) {
       const TiffEntry* wb = encryptedIFD.getEntry(TiffTag::SONYRGGBLEVELS);
       if (wb->count != 4)
-        ThrowRDE("WB has %d entries instead of 4", wb->count);
+        ThrowRDE("WB has %u entries instead of 4", wb->count);
       mRaw->metadata.wbCoeffs[0] = wb->getFloat(0);
       mRaw->metadata.wbCoeffs[1] = wb->getFloat(1);
       mRaw->metadata.wbCoeffs[2] = wb->getFloat(3);
@@ -629,7 +629,7 @@ void ArwDecoder::GetWB() const {
     if (encryptedIFD.hasEntry(TiffTag::SONYBLACKLEVEL)) {
       const TiffEntry* bl = encryptedIFD.getEntry(TiffTag::SONYBLACKLEVEL);
       if (bl->count != 4)
-        ThrowRDE("Black Level has %d entries instead of 4", bl->count);
+        ThrowRDE("Black Level has %u entries instead of 4", bl->count);
       mRaw->blackLevelSeparate =
           Array2DRef(mRaw->blackLevelSeparateStorage.data(), 2, 2);
       auto blackLevelSeparate1D = *mRaw->blackLevelSeparate->getAsArray1DRef();
@@ -640,7 +640,7 @@ void ArwDecoder::GetWB() const {
     if (encryptedIFD.hasEntry(TiffTag::SONYWHITELEVEL)) {
       const TiffEntry* wl = encryptedIFD.getEntry(TiffTag::SONYWHITELEVEL);
       if (wl->count != 1 && wl->count != 3)
-        ThrowRDE("White Level has %d entries instead of 1 or 3", wl->count);
+        ThrowRDE("White Level has %u entries instead of 1 or 3", wl->count);
       mRaw->whitePoint = wl->getU16(0) >> mShiftDownScaleForExif;
     }
   }
diff --git a/src/librawspeed/decoders/Cr2Decoder.cpp b/src/librawspeed/decoders/Cr2Decoder.cpp
@@ -170,7 +170,7 @@ RawImage Cr2Decoder::decodeNewFormat() {
           raw->getEntryRecursive(TiffTag::CANONCR2SLICE);
       cr2SliceEntry) {
     if (cr2SliceEntry->count != 3) {
-      ThrowRDE("Found RawImageSegmentation tag with %d elements, should be 3.",
+      ThrowRDE("Found RawImageSegmentation tag with %u elements, should be 3.",
                cr2SliceEntry->count);
     }
 
diff --git a/src/librawspeed/decoders/DngDecoder.cpp b/src/librawspeed/decoders/DngDecoder.cpp
@@ -72,7 +72,7 @@ DngDecoder::DngDecoder(TiffRootIFDOwner&& rootIFD, Buffer file)
       mRootIFD->getEntryRecursive(TiffTag::DNGVERSION)->getData().getBuffer(4);
 
   if (v[0] != 1) {
-    ThrowRDE("Not a supported DNG image format: v%u.%u.%u.%u",
+    ThrowRDE("Not a supported DNG image format: v%i.%i.%i.%i",
              static_cast<int>(v[0]), static_cast<int>(v[1]),
              static_cast<int>(v[2]), static_cast<int>(v[3]));
   }
@@ -159,7 +159,7 @@ Optional<iRectangle2D> DngDecoder::parseACTIVEAREA(const TiffIFD* raw) const {
 
   const TiffEntry* active_area = raw->getEntry(TiffTag::ACTIVEAREA);
   if (active_area->count != 4)
-    ThrowRDE("active area has %d values instead of 4", active_area->count);
+    ThrowRDE("active area has %u values instead of 4", active_area->count);
 
   const iRectangle2D fullImage(0, 0, mRaw->dim.x, mRaw->dim.y);
 
@@ -172,7 +172,7 @@ Optional<iRectangle2D> DngDecoder::parseACTIVEAREA(const TiffIFD* raw) const {
   if (!(fullImage.isPointInsideInclusive(topLeft) &&
         fullImage.isPointInsideInclusive(bottomRight) &&
         bottomRight >= topLeft)) {
-    ThrowRDE("Rectangle (%u, %u, %u, %u) not inside image (%u, %u, %u, %u).",
+    ThrowRDE("Rectangle (%i, %i, %i, %i) not inside image (%i, %i, %i, %i).",
              topLeft.x, topLeft.y, bottomRight.x, bottomRight.y,
              fullImage.getTopLeft().x, fullImage.getTopLeft().y,
              fullImage.getBottomRight().x, fullImage.getBottomRight().y);
@@ -229,7 +229,7 @@ void DngDecoder::parseCFA(const TiffIFD* raw) const {
   iPoint2D cfaSize(cfadim->getU32(1), cfadim->getU32(0));
   if (!cfaSize.hasPositiveArea() || cfaSize.area() != cPat->count) {
     ThrowRDE("CFA pattern dimension and pattern count does not "
-             "match: %d.",
+             "match: %u.",
              cPat->count);
   }
 
@@ -351,7 +351,7 @@ DngDecoder::getTilingDescription(const TiffIFD* raw) const {
 
   if (yPerSlice == 0 ||
       roundUpDivisionSafe(mRaw->dim.y, yPerSlice) != counts->count) {
-    ThrowRDE("Invalid y per slice %u or strip count %u (height = %u)",
+    ThrowRDE("Invalid y per slice %u or strip count %u (height = %i)",
              yPerSlice, counts->count, mRaw->dim.y);
   }
 
@@ -465,7 +465,7 @@ RawImage DngDecoder::decodeRawInternal() {
 
   bps = raw->getEntry(TiffTag::BITSPERSAMPLE)->getU32();
   if (*bps < 1 || *bps > 32)
-    ThrowRDE("Unsupported bit per sample count: %u.", *bps);
+    ThrowRDE("Unsupported bit per sample count: %i.", *bps);
 
   uint32_t sample_format = 1;
   if (raw->hasEntry(TiffTag::SAMPLEFORMAT))
diff --git a/src/librawspeed/decoders/KdcDecoder.cpp b/src/librawspeed/decoders/KdcDecoder.cpp
@@ -79,7 +79,7 @@ RawImage KdcDecoder::decodeRawInternal() {
   if (auto compression =
           mRootIFD->getEntryRecursive(TiffTag::COMPRESSION)->getU32();
       7 != compression)
-    ThrowRDE("Unsupported compression %d", compression);
+    ThrowRDE("Unsupported compression %u", compression);
 
   const TiffEntry* ifdoffset = mRootIFD->getEntryRecursive(TiffTag::KODAK_IFD2);
   if (!ifdoffset)
@@ -104,7 +104,7 @@ RawImage KdcDecoder::decodeRawInternal() {
   mRaw->dim = iPoint2D(width, height);
 
   if (!mRaw->dim.hasPositiveArea() || !(mRaw->dim <= iPoint2D(4304, 3221)))
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
 
   const Buffer inputBuffer = KdcDecoder::getInputBuffer();
diff --git a/src/librawspeed/decoders/NefDecoder.cpp b/src/librawspeed/decoders/NefDecoder.cpp
@@ -230,7 +230,7 @@ void NefDecoder::DecodeUncompressed() const {
 
   if (yPerSlice == 0 || yPerSlice > static_cast<uint32_t>(mRaw->dim.y) ||
       roundUpDivisionSafe(mRaw->dim.y, yPerSlice) != counts->count) {
-    ThrowRDE("Invalid y per slice %u or strip count %u (height = %u)",
+    ThrowRDE("Invalid y per slice %u or strip count %u (height = %i)",
              yPerSlice, counts->count, mRaw->dim.y);
   }
 
@@ -630,10 +630,10 @@ void NefDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {
     const TiffEntry* bl =
         mRootIFD->getEntryRecursive(TiffTag::NIKON_BLACKLEVEL);
     if (bl->count != 4)
-      ThrowRDE("BlackLevel has %d entries instead of 4", bl->count);
+      ThrowRDE("BlackLevel has %u entries instead of 4", bl->count);
     uint32_t bitPerPixel = getBitPerSample();
     if (bitPerPixel != 12 && bitPerPixel != 14)
-      ThrowRDE("Bad bit per pixel: %i", bitPerPixel);
+      ThrowRDE("Bad bit per pixel: %u", bitPerPixel);
     const int sh = 14 - bitPerPixel;
     mRaw->blackLevelSeparate =
         Array2DRef(mRaw->blackLevelSeparateStorage.data(), 2, 2);
@@ -664,7 +664,7 @@ void NefDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {
 // trivial to run this multithreaded.
 void NefDecoder::DecodeNikonSNef(ByteStream input) const {
   if (mRaw->dim.x < 6)
-    ThrowIOE("got a %u wide sNEF, aborting", mRaw->dim.x);
+    ThrowIOE("got a %i wide sNEF, aborting", mRaw->dim.x);
 
   // We need to read the applied whitebalance, since we should return
   // data before whitebalance, so we "unapply" it.
diff --git a/src/librawspeed/decoders/RafDecoder.cpp b/src/librawspeed/decoders/RafDecoder.cpp
@@ -285,7 +285,7 @@ void RafDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {
     unsigned bps =
         mRootIFD->getEntryRecursive(TiffTag::FUJI_BITSPERSAMPLE)->getU32();
     if (bps > 16)
-      ThrowRDE("Unexpected bit depth: %i", bps);
+      ThrowRDE("Unexpected bit depth: %u", bps);
     mRaw->whitePoint = implicit_cast<int>((1UL << bps) - 1UL);
   }
 
diff --git a/src/librawspeed/decoders/RawDecoder.cpp b/src/librawspeed/decoders/RawDecoder.cpp
@@ -75,7 +75,7 @@ void RawDecoder::decodeUncompressed(const TiffIFD* rawIFD,
 
   if (yPerSlice == 0 || yPerSlice > static_cast<uint32_t>(mRaw->dim.y) ||
       roundUpDivisionSafe(mRaw->dim.y, yPerSlice) != counts->count) {
-    ThrowRDE("Invalid y per slice %u or strip count %u (height = %u)",
+    ThrowRDE("Invalid y per slice %u or strip count %u (height = %d)",
              yPerSlice, counts->count, mRaw->dim.y);
   }
 
diff --git a/src/librawspeed/decoders/StiDecoder.cpp b/src/librawspeed/decoders/StiDecoder.cpp
@@ -74,7 +74,7 @@ void StiDecoder::DecodeUncompressed(const TiffIFD* raw) const {
   // FIXME: could be wrong.
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.y % 2 != 0 || mRaw->dim.x > 4992 || mRaw->dim.y > 6668) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 
diff --git a/src/librawspeed/decoders/ThreefrDecoder.cpp b/src/librawspeed/decoders/ThreefrDecoder.cpp
@@ -93,7 +93,7 @@ void ThreefrDecoder::DecodeUncompressed(const TiffIFD* raw) const {
   // FIXME: could be wrong. max "active pixels" - "100 MP"
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.x > 12000 || mRaw->dim.y > 8842) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 
diff --git a/src/librawspeed/decompressors/AbstractDngDecompressor.cpp b/src/librawspeed/decompressors/AbstractDngDecompressor.cpp
@@ -86,7 +86,7 @@ template <> void AbstractDngDecompressor::decompressThread<1>() const noexcept {
 
       if (inputPitchBits % 8 != 0) {
         ThrowRDE("Bad combination of cpp (%u), bps (%u) and width (%u), the "
-                 "pitch is %u bits, which is not a multiple of 8 (1 byte)",
+                 "pitch is %d bits, which is not a multiple of 8 (1 byte)",
                  mRaw->getCpp(), mBps, e.width, inputPitchBits);
       }
 
diff --git a/src/librawspeed/decompressors/AbstractLJpegDecoder.cpp b/src/librawspeed/decompressors/AbstractLJpegDecoder.cpp
@@ -145,7 +145,7 @@ void AbstractLJpegDecoder::parseSOF(ByteStream sofInput, SOFInfo* sof) {
   }
 
   if (sof->cps > static_cast<uint32_t>(mRaw->dim.x)) {
-    ThrowRDE("Component count should be no greater than row length (%u vs %u).",
+    ThrowRDE("Component count should be no greater than row length (%u vs %d).",
              sof->cps, mRaw->dim.x);
   }
 
diff --git a/src/librawspeed/decompressors/Cr2Decompressor.h b/src/librawspeed/decompressors/Cr2Decompressor.h
@@ -65,7 +65,7 @@ class Cr2SliceWidths final {
       : numSlices(numSlices_), sliceWidth(sliceWidth_),
         lastSliceWidth(lastSliceWidth_) {
     if (numSlices < 1)
-      ThrowRDE("Bad slice count: %u", numSlices);
+      ThrowRDE("Bad slice count: %d", numSlices);
   }
 
   [[nodiscard]] bool empty() const {
diff --git a/src/librawspeed/decompressors/Cr2DecompressorImpl.h b/src/librawspeed/decompressors/Cr2DecompressorImpl.h
@@ -311,7 +311,7 @@ Cr2Decompressor<PrefixCodeDecoder>::Cr2Decompressor(
   frame.y /= dsc.Y_S_F;
 
   if (mRaw->dim.x > 19440 || mRaw->dim.y > 5920) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 
@@ -334,7 +334,7 @@ Cr2Decompressor<PrefixCodeDecoder>::Cr2Decompressor(
 
   for (auto* width : {&slicing.sliceWidth, &slicing.lastSliceWidth}) {
     if (*width % dsc.sliceColStep != 0) {
-      ThrowRDE("Slice width (%u) should be multiple of pixel group size (%u)",
+      ThrowRDE("Slice width (%d) should be multiple of pixel group size (%d)",
                *width, dsc.sliceColStep);
     }
     *width /= dsc.sliceColStep;
diff --git a/src/librawspeed/decompressors/Cr2LJpegDecoder.cpp b/src/librawspeed/decompressors/Cr2LJpegDecoder.cpp
@@ -50,7 +50,7 @@ Cr2LJpegDecoder::Cr2LJpegDecoder(ByteStream bs, const RawImage& img)
 
   if (!mRaw->dim.x || !mRaw->dim.y || mRaw->dim.x > 19440 ||
       mRaw->dim.y > 5920) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 }
diff --git a/src/librawspeed/decompressors/HasselbladDecompressor.cpp b/src/librawspeed/decompressors/HasselbladDecompressor.cpp
@@ -48,7 +48,7 @@ HasselbladDecompressor::HasselbladDecompressor(RawImage mRaw_,
   // FIXME: could be wrong. max "active pixels" - "100 MP"
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.x > 12000 || mRaw->dim.y > 8842) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 
diff --git a/src/librawspeed/decompressors/HasselbladLJpegDecoder.cpp b/src/librawspeed/decompressors/HasselbladLJpegDecoder.cpp
@@ -42,7 +42,7 @@ HasselbladLJpegDecoder::HasselbladLJpegDecoder(ByteStream bs,
   // FIXME: could be wrong. max "active pixels" - "100 MP"
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.x > 12000 || mRaw->dim.y > 8842) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 }
diff --git a/src/librawspeed/decompressors/KodakDecompressor.cpp b/src/librawspeed/decompressors/KodakDecompressor.cpp
@@ -53,7 +53,7 @@ KodakDecompressor::KodakDecompressor(RawImage img, ByteStream bs, int bps_,
 
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 4 != 0 ||
       mRaw->dim.x > 4516 || mRaw->dim.y > 3012)
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
 
   if (bps != 10 && bps != 12)
diff --git a/src/librawspeed/decompressors/LJpegDecompressor.cpp b/src/librawspeed/decompressors/LJpegDecompressor.cpp
@@ -140,7 +140,7 @@ LJpegDecompressor::LJpegDecompressor(RawImage img, iRectangle2D imgFrame_,
       frame.dim.x < mcusToConsume ||
       frame.mcu.y * frame.dim.y < imgFrame.dim.y ||
       frame.mcu.x * frame.dim.x < tileRequiredWidth) {
-    ThrowRDE("LJpeg frame (%d, %d) is smaller than expected (%u, %u)",
+    ThrowRDE("LJpeg frame (%d, %d) is smaller than expected (%d, %d)",
              frame.mcu.x * frame.dim.x, frame.mcu.y * frame.dim.y,
              tileRequiredWidth, imgFrame.dim.y);
   }
diff --git a/src/librawspeed/decompressors/NikonDecompressor.cpp b/src/librawspeed/decompressors/NikonDecompressor.cpp
@@ -354,7 +354,7 @@ class NikonLASDecompressor final {
       }
 
       if (l > 16) {
-        ThrowRDE("Corrupt JPEG data: bad Huffman code:%u\n", l);
+        ThrowRDE("Corrupt JPEG data: bad Huffman code:%d\n", l);
       } else {
         rv = dctbl1.huffval[dctbl1.valptr[l] + (code - dctbl1.mincode[l])];
       }
@@ -479,7 +479,7 @@ NikonDecompressor::NikonDecompressor(RawImage raw, ByteStream metadata,
 
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.x > 8288 || mRaw->dim.y > 5520)
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
 
   switch (bitsPS) {
diff --git a/src/librawspeed/decompressors/OlympusDecompressor.cpp b/src/librawspeed/decompressors/OlympusDecompressor.cpp
@@ -222,7 +222,7 @@ OlympusDecompressor::OlympusDecompressor(RawImage img) : mRaw(std::move(img)) {
 
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.y % 2 != 0 || mRaw->dim.x > 10400 || mRaw->dim.y > 7792)
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
 }
 
diff --git a/src/librawspeed/decompressors/PentaxDecompressor.cpp b/src/librawspeed/decompressors/PentaxDecompressor.cpp
@@ -59,7 +59,7 @@ PentaxDecompressor::PentaxDecompressor(RawImage img,
 
   if (!mRaw->dim.x || !mRaw->dim.y || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.x > 8384 || mRaw->dim.y > 6208) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 }
@@ -96,7 +96,7 @@ PentaxDecompressor::SetupPrefixCodeDecoder_Modern(ByteStream stream) {
     v1[i] = stream.getByte();
 
     if (v1[i] == 0 || v1[i] > 12)
-      ThrowRDE("Data corrupt: v1[%i]=%i, expected [1..12]", depth, v1[i]);
+      ThrowRDE("Data corrupt: v1[%u]=%u, expected [1..12]", depth, v1[i]);
   }
 
   std::vector<uint8_t> nCodesPerLength;
diff --git a/src/librawspeed/decompressors/PhaseOneDecompressor.cpp b/src/librawspeed/decompressors/PhaseOneDecompressor.cpp
@@ -51,7 +51,7 @@ PhaseOneDecompressor::PhaseOneDecompressor(RawImage img,
 
   if (!mRaw->dim.hasPositiveArea() || mRaw->dim.x % 2 != 0 ||
       mRaw->dim.x > 11976 || mRaw->dim.y > 8854) {
-    ThrowRDE("Unexpected image dimensions found: (%u; %u)", mRaw->dim.x,
+    ThrowRDE("Unexpected image dimensions found: (%d; %d)", mRaw->dim.x,
              mRaw->dim.y);
   }
 
@@ -63,7 +63,7 @@ void PhaseOneDecompressor::prepareStrips() {
 
   // If the length is different, then the 'strips' vector is clearly incorrect.
   if (strips.size() != static_cast<decltype(strips)::size_type>(mRaw->dim.y)) {
-    ThrowRDE("Height (%u) vs strip count %zu mismatch", mRaw->dim.y,
+    ThrowRDE("Height (%d) vs strip count %zu mismatch", mRaw->dim.y,
              strips.size());
   }
 
diff --git a/src/librawspeed/decompressors/SamsungV1Decompressor.cpp b/src/librawspeed/decompressors/SamsungV1Decompressor.cpp
@@ -50,7 +50,7 @@ SamsungV1Decompressor::SamsungV1Decompressor(const RawImage& image,
     ThrowRDE("Unexpected component count / data type");
 
   if (bit != 12)
-    ThrowRDE("Unexpected bit per pixel (%u)", bit);
+    ThrowRDE("Unexpected bit per pixel (%d)", bit);
 
   const uint32_t width = mRaw->dim.x;
   const uint32_t height = mRaw->dim.y;
diff --git a/src/librawspeed/decompressors/SamsungV2Decompressor.cpp b/src/librawspeed/decompressors/SamsungV2Decompressor.cpp
diff --git a/src/librawspeed/decompressors/SonyArw2Decompressor.cpp b/src/librawspeed/decompressors/SonyArw2Decompressor.cpp
diff --git a/src/librawspeed/decompressors/UncompressedDecompressor.cpp b/src/librawspeed/decompressors/UncompressedDecompressor.cpp
diff --git a/src/librawspeed/decompressors/VC5Decompressor.cpp b/src/librawspeed/decompressors/VC5Decompressor.cpp
diff --git a/src/librawspeed/metadata/ColorFilterArray.cpp b/src/librawspeed/metadata/ColorFilterArray.cpp
diff --git a/src/librawspeed/tiff/CiffIFD.cpp b/src/librawspeed/tiff/CiffIFD.cpp
diff --git a/src/librawspeed/tiff/TiffIFD.cpp b/src/librawspeed/tiff/TiffIFD.cpp
diff --git a/src/utilities/identify/rawspeed-identify.cpp b/src/utilities/identify/rawspeed-identify.cpp
diff --git a/src/utilities/rstest/rstest.cpp b/src/utilities/rstest/rstest.cpp

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {`
`57`	`57`	`case static_cast<int>(rawspeed::BitOrder::JPEG):`
`58`	`58`	`return rawspeed::BitOrder(val);`
`59`	`59`	`default:`
`60`		`- ThrowRSE("Unknown bit order: %u", val);`
	`60`	`+ ThrowRSE("Unknown bit order: %i", val);`
`61`	`61`	`}`
`62`	`62`	`__builtin_unreachable();`
`63`	`63`	`}();`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ template <typename CodeTag> class AbstractPrefixCodeTranscoder {`
`93`	`93`
`94`	`94`	`bool operator==(const AbstractPrefixCodeTranscoder& other) const {`
`95`	`95`	`return code.symbols == other.code.symbols &&`
`96`		`- code.Base::codeValues == other.codeValues;`
	`96`	`+ code.Base::codeValues == other.code.Base::codeValues;`
`97`	`97`	`}`
`98`	`98`	`};`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ void RawImageData::setCpp(uint32_t val) {`
`155`	`155`	`ThrowRDE("Attempted to set Components per pixel after data allocation");`
`156`	`156`	`if (val > 4) {`
`157`	`157`	`ThrowRDE(`
`158`		`- "Only up to 4 components per pixel is support - attempted to set: %d",`
	`158`	`+ "Only up to 4 components per pixel is support - attempted to set: %u",`
`159`	`159`	`val);`
`160`	`160`	`}`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ RawImage Cr2Decoder::decodeNewFormat() {`
`170`	`170`	`raw->getEntryRecursive(TiffTag::CANONCR2SLICE);`
`171`	`171`	`cr2SliceEntry) {`
`172`	`172`	`if (cr2SliceEntry->count != 3) {`
`173`		`- ThrowRDE("Found RawImageSegmentation tag with %d elements, should be 3.",`
	`173`	`+ ThrowRDE("Found RawImageSegmentation tag with %u elements, should be 3.",`
`174`	`174`	`cr2SliceEntry->count);`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ void RafDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {`
`285`	`285`	`unsigned bps =`
`286`	`286`	`mRootIFD->getEntryRecursive(TiffTag::FUJI_BITSPERSAMPLE)->getU32();`
`287`	`287`	`if (bps > 16)`
`288`		`- ThrowRDE("Unexpected bit depth: %i", bps);`
	`288`	`+ ThrowRDE("Unexpected bit depth: %u", bps);`
`289`	`289`	`mRaw->whitePoint = implicit_cast<int>((1UL << bps) - 1UL);`
`290`	`290`	`}`
`291`	`291`