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

LCP engine v2

Browse Source 
see issue 1343
This commit is contained in:
Oliver Duis
2012-05-23 00:11:38 +02:00
parent a86846b670
commit e5d42eb5eb
21 changed files with 193 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/iptransform.cc
View File

@@ -177,11 +177,11 @@ bool ImProcFunctions::transCoord (int W, int H, int x, int y, int w, int h, int&
}
void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH,
double focalLen, int rawRotationDeg) {
double focalLen, double focalLen35mm, int rawRotationDeg) {
LCPMapper *pLCPMap=NULL;
if (needsLCP() && focalLen>0) {
LCPProfile *pLCPProf=lcpStore->getProfile(params->lensProf.lcpFile);
if (pLCPProf) pLCPMap=new LCPMapper(pLCPProf, focalLen, false, original->width, original->height, params->coarse, rawRotationDeg);
if (pLCPProf) pLCPMap=new LCPMapper(pLCPProf, focalLen, focalLen35mm, 0, false, original->width, original->height, params->coarse, rawRotationDeg);
}
if (!(needsCA() || needsDistortion() || needsRotation() || needsPerspective() || needsLCP()) && needsVignetting())
@@ -194,6 +194,8 @@ void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed,
}
else
transformSep (original, transformed, cx, cy, sx, sy, oW, oH, pLCPMap);
if (pLCPMap) delete pLCPMap;
}
void calcVignettingParams(int oW, int oH, const VignettingParams& vignetting, double &w2, double &h2, double& maxRadius, double &v, double &b, double &mul)