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

Metadata no longer overwrites camconsts

Browse Source 
Added suggested changes to camconst and removed the camconst.json overwriting part as per the review comment
This commit is contained in:
Battyányi Dániel 2023-09-12 00:07:43 +02:00
parent ab6d5b190c
commit f09612453a
No known key found for this signature in database
GPG Key ID: 7125B147DC00233A
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/camconst.json
View File

@ -1571,7 +1571,10 @@ Camera constants:
{ // Quality A, samples provided by Daniel Catalina (#5839) and pi99y (#5860) { // Quality A, samples provided by Daniel Catalina (#5839) and pi99y (#5860)
"make_model": [ "FUJIFILM X-T3", "FUJIFILM X-PRO3" ], "make_model": [ "FUJIFILM X-T3", "FUJIFILM X-PRO3" ],
"dcraw_matrix": [ 13426,-6334,-1177,-4244,12136,2371,-580,1303,5980 ], // DNG_v11, standard_v2 d65 "dcraw_matrix": [ 13426,-6334,-1177,-4244,12136,2371,-580,1303,5980 ], // DNG_v11, standard_v2 d65
"raw_crop": [ 0, 5, 6252, 4176], "raw_crop" : [
{ "frame" : [6384, 4182], "crop": [ 0, 5, 6252, 4176] },
{ "frame" : [6384, 3348], "crop": [624, 0, 5004, 3348] }
],
"white": [ 16170, 16275, 16170 ] // typical safe-margins with LENR "white": [ 16170, 16275, 16170 ] // typical safe-margins with LENR
// negligible aperture scaling effect // negligible aperture scaling effect
}, },

8
rtengine/rawimage.cc
View File

@ -560,12 +560,6 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
raw_crop_cc = true; raw_crop_cc = true;
int lm, tm, w, h; int lm, tm, w, h;
cc->get_rawCrop(raw_width, raw_height, lm, tm, w, h); cc->get_rawCrop(raw_width, raw_height, lm, tm, w, h);
if (read_crop.crop_mode){ // RT
left_margin = read_crop.left_margin; // RT
top_margin = read_crop.top_margin; // RT
tm = 0; // RT
lm = 0; // RT
} // RT
if (isXtrans()) { if (isXtrans()) {
shiftXtransMatrix(6 - ((top_margin - tm) % 6), 6 - ((left_margin - lm) % 6)); shiftXtransMatrix(6 - ((top_margin - tm) % 6), 6 - ((left_margin - lm) % 6));
@ -575,10 +569,8 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
} }
} }
if (!read_crop.crop_mode) { // RT
left_margin = lm; left_margin = lm;
top_margin = tm; top_margin = tm;
} // RT
if (w < 0) { if (w < 0) {
iwidth += w; iwidth += w;