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

Fixed issue #6312

Browse Source 
Fixed issue, where raw cropped Fuji X-Pro3 could not be loaded correctly. This would result in a Segmentation Fault.
With these changes the program should read the correct dimensions from the file's metadata, and load the image accordingly.
This commit is contained in:
Dániel Battyányi
2023-08-30 22:17:16 +02:00
parent a56c11570f
commit 23e2f0cca5
3 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/rawimage.cc
View File

@@ -560,6 +560,13 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
raw_crop_cc = true;
int lm, tm, w, h;
cc->get_rawCrop(raw_width, raw_height, lm, tm, w, h);
is_cropped = read_crop.complete && (raw_width - read_crop.width > is_cropped_margin || raw_height - read_crop.height > is_cropped_margin);
if (is_cropped){
left_margin = read_crop.left_margin;
top_margin = read_crop.top_margin;
tm = 0;
lm = 0;
}
if (isXtrans()) {
shiftXtransMatrix(6 - ((top_margin - tm) % 6), 6 - ((left_margin - lm) % 6));
@@ -569,8 +576,10 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
}
}
left_margin = lm;
top_margin = tm;
if (!is_cropped) {
left_margin = lm;
top_margin = tm;
}
if (w < 0) {
iwidth += w;