Merge remote-tracking branch 'origin/fix-warnings-5.9' into fix-warnings-5.12

This commit is contained in:
Lawrence Lee
2024-11-16 22:27:29 -08:00
9 changed files with 115 additions and 111 deletions

View File

@@ -736,7 +736,7 @@ FramesData::FramesData(const Glib::ustring &fname, time_t ts) :
// -----------------------
// Special file type detection (HDR, PixelShift)
// ------------------------
uint16 bitspersample = 0, samplesperpixel = 0, sampleformat = 0, photometric = 0, compression = 0;
std::uint16_t bitspersample = 0, samplesperpixel = 0, sampleformat = 0, photometric = 0, compression = 0;
const auto bps = exif.findKey(Exiv2::ExifKey("Exif.Image.BitsPerSample"));
const auto spp = exif.findKey(Exiv2::ExifKey("Exif.Image.SamplesPerPixel"));
const auto sf = exif.findKey(Exiv2::ExifKey("Exif.Image.SampleFormat"));