Merge pull request #7330 from Lawrence37/minolta-rd175-libraw-fix
Minolta RD175 LibRaw white level fix
This commit is contained in:
commit
5f7cea0bcb
@ -796,12 +796,22 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
|
|||||||
#ifdef LIBRAW_USE_OPENMP
|
#ifdef LIBRAW_USE_OPENMP
|
||||||
MyMutex::MyLock lock(*librawMutex);
|
MyMutex::MyLock lock(*librawMutex);
|
||||||
#endif
|
#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();
|
err = libraw->unpack();
|
||||||
}
|
}
|
||||||
if (err) {
|
if (err) {
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update white level in case LibRaw::unpack() read a new value.
|
||||||
|
maximum = libraw->imgdata.color.maximum;
|
||||||
|
|
||||||
auto &rd = libraw->imgdata.rawdata;
|
auto &rd = libraw->imgdata.rawdata;
|
||||||
raw_image = rd.raw_image;
|
raw_image = rd.raw_image;
|
||||||
if (rd.float_image) {
|
if (rd.float_image) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user