Merge pull request #7330 from Lawrence37/minolta-rd175-libraw-fix

Minolta RD175 LibRaw white level fix
This commit is contained in:
Lawrence37 2025-03-23 12:34:41 -07:00 committed by GitHub
commit 5f7cea0bcb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -796,12 +796,22 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
#ifdef LIBRAW_USE_OPENMP
MyMutex::MyLock lock(*librawMutex);
#endif
// For some cameras like Minolta RD175, the real white level is
// read with LibRaw::unpack(). Here, we initialize LibRaw's
// maximum with the value read earlier. Later, we read the value
// back in case it has changed.
libraw->imgdata.color.maximum = maximum;
err = libraw->unpack();
}
if (err) {
return err;
}
// Update white level in case LibRaw::unpack() read a new value.
maximum = libraw->imgdata.color.maximum;
auto &rd = libraw->imgdata.rawdata;
raw_image = rd.raw_image;
if (rd.float_image) {