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

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-09-14 09:09:18 +02:00
parent 7bbecdf50c 7d8de8b020
commit 9786ec0687
40 changed files with 2861 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/dcrop.cc
View File

@@ -708,9 +708,7 @@ void Crop::update (int todo)
if (needstransform)
parent->ipf.transform (baseCrop, transCrop, cropx / skip, cropy / skip, trafx / skip, trafy / skip, skips (parent->fw, skip), skips (parent->fh, skip), parent->getFullWidth(), parent->getFullHeight(),
parent->imgsrc->getMetaData()->getFocalLen(), parent->imgsrc->getMetaData()->getFocalLen35mm(),
parent->imgsrc->getMetaData()->getFocusDist(),
parent->imgsrc->getMetaData()->getFNumber(),
parent->imgsrc->getMetaData(),
parent->imgsrc->getRotateDegree(), false);
else {
baseCrop->copyData (transCrop);
@@ -1754,8 +1752,9 @@ bool check_need_larger_crop_for_lcp_distortion (int fw, int fh, int x, int y, in
return false;
}
return (params.lensProf.lcpFile.length() > 0 &&
params.lensProf.useDist);
return (params.lensProf.useDist &&
(params.lensProf.useLensfun ||
params.lensProf.lcpFile.length() > 0));
}
} // namespace