liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into release-5.12

Browse Source
This commit is contained in:
Lawrence Lee 2025-04-21 22:40:29 -07:00
commit a57b6afc5f
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/dcraw.cc
View File

@ -7842,6 +7842,8 @@ void CLASS parse_qt (int end)
while (ftell(ifp)+7 < end) { while (ftell(ifp)+7 < end) {
save = ftell(ifp); save = ftell(ifp);
if ((size = get4()) < 8) return; if ((size = get4()) < 8) return;
if ((int)size < 0) return; // 2+GB is too much
if (save + size < save) return; // 32bit overflow
fread (tag, 4, 1, ifp); fread (tag, 4, 1, ifp);
if (!memcmp(tag,"moov",4) || if (!memcmp(tag,"moov",4) ||
!memcmp(tag,"udta",4) || !memcmp(tag,"udta",4) ||

4
rtengine/simpleprocess.cc
View File

@ -277,10 +277,10 @@ private:
currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method, params.wb.observer); currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method, params.wb.observer);
ColorTemp currWBitc; ColorTemp currWBitc;
if (params.wb.method == "autitcgreen" && flush) { if (params.wb.method == "autitcgreen") {
imgsrc->getrgbloc(0, 0, fh, fw, 0, 0, fh, fw, params.wb); imgsrc->getrgbloc(0, 0, fh, fw, 0, 0, fh, fw, params.wb);
} }
const bool autowb = (params.wb.method == "autitcgreen" && imgsrc->isRAW() && flush); const bool autowb = (params.wb.method == "autitcgreen" && imgsrc->isRAW());
ColorTemp autoWB; ColorTemp autoWB;
int dread = 0; int dread = 0;
int bia = 1; int bia = 1;