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

RT crashes instantly with Sony FE lcp profiles, Issue 2196

Browse Source
This commit is contained in:
Ingo
2014-01-15 10:48:36 +01:00
parent d3be460e63
commit 6064f1afc1
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/lcp.cc
View File

@@ -233,7 +233,7 @@ LCPProfile::LCPProfile(Glib::ustring fname) {
XML_SetUserData(parser, (void *)this); XML_SetUserData(parser, (void *)this);
isFisheye=inCamProfiles=firstLIDone=inPerspect=inAlternateLensID=false; isFisheye=inCamProfiles=firstLIDone=inPerspect=inAlternateLensID=inAlternateLensNames=false;
sensorFormatFactor=1; sensorFormatFactor=1;
for (int i=0;i<MaxPersModelCount;i++) aPersModel[i]=NULL; for (int i=0;i<MaxPersModelCount;i++) aPersModel[i]=NULL;
persModelCount=0; *inInvalidTag=0; persModelCount=0; *inInvalidTag=0;
@@ -323,7 +323,7 @@ void LCPProfile::calcParams(int mode, float focalLength, float focusDist, float
// find the frames with the least distance, focal length wise // find the frames with the least distance, focal length wise
LCPPersModel *pLow=NULL, *pHigh=NULL; LCPPersModel *pLow=NULL, *pHigh=NULL;
float focalLengthLog=log(focalLength); //, apertureLog=aperture>0 ? log(aperture) : 0; float focalLengthLog=log(focalLength); //, apertureLog=aperture>0 ? log(aperture) : 0;
float focusDistLog=focusDist>0? log(focusDist)+euler : 0; float focusDistLog=focusDist>0? log(focusDist)+euler : 0;
@@ -445,7 +445,7 @@ void LCPProfile::calcParams(int mode, float focalLength, float focusDist, float
} }
//printf("LCP mode=%i, dist: %g found frames: Fno %g-%g; FocLen %g-%g; Dist %g-%g with weight %g\n", mode, focusDist, pLow->aperture, pHigh->aperture, pLow->focLen, pHigh->focLen, pLow->focDist, pHigh->focDist, facLow); //printf("LCP mode=%i, dist: %g found frames: Fno %g-%g; FocLen %g-%g; Dist %g-%g with weight %g\n", mode, focusDist, pLow->aperture, pHigh->aperture, pLow->focLen, pHigh->focLen, pLow->focDist, pHigh->focDist, facLow);
} else printf("Error: LCP file contained no parameters\n"); } else printf("Error: LCP file contained no %s parameters\n",mode==0 ? "vignette" : mode == 1 ? "distortion" : "CA" );
} }
void LCPProfile::print() const { void LCPProfile::print() const {
@@ -470,7 +470,8 @@ void XMLCALL LCPProfile::XmlStartHandler(void *pLCPProfile, const char *el, cons
if (!strcmp("CameraProfiles",src)) pProf->inCamProfiles=true; if (!strcmp("CameraProfiles",src)) pProf->inCamProfiles=true;
if (!strcmp("AlternateLensIDs",src)) pProf->inAlternateLensID=true; if (!strcmp("AlternateLensIDs",src)) pProf->inAlternateLensID=true;
if (!pProf->inCamProfiles || pProf->inAlternateLensID) return; if (!strcmp("AlternateLensNames",src)) pProf->inAlternateLensNames=true;
if (!pProf->inCamProfiles || pProf->inAlternateLensID || pProf->inAlternateLensNames) return;
if (!strcmp("li",src)) { if (!strcmp("li",src)) {
pProf->pCurPersModel=new LCPPersModel(); pProf->pCurPersModel=new LCPPersModel();
@@ -498,7 +499,7 @@ void XMLCALL LCPProfile::XmlStartHandler(void *pLCPProfile, const char *el, cons
} else if (!strcmp("ChromaticBlueGreenModel",src)) { } else if (!strcmp("ChromaticBlueGreenModel",src)) {
pProf->pCurCommon=&pProf->pCurPersModel->chromBG; pProf->pCurCommon=&pProf->pCurPersModel->chromBG;
parseAttr=true; parseAttr=true;
} else if (!strcmp("VignetteModel",src)) { } else if (!strcmp("VignetteModel",src)) {
pProf->pCurCommon=&pProf->pCurPersModel->vignette; pProf->pCurCommon=&pProf->pCurPersModel->vignette;
parseAttr=true; parseAttr=true;
} }
@@ -520,7 +521,7 @@ void XMLCALL LCPProfile::XmlStartHandler(void *pLCPProfile, const char *el, cons
void XMLCALL LCPProfile::XmlTextHandler(void *pLCPProfile, const XML_Char *s, int len) { void XMLCALL LCPProfile::XmlTextHandler(void *pLCPProfile, const XML_Char *s, int len) {
LCPProfile *pProf=static_cast<LCPProfile*>(pLCPProfile); LCPProfile *pProf=static_cast<LCPProfile*>(pLCPProfile);
if (!pProf->inCamProfiles || pProf->inAlternateLensID || *pProf->inInvalidTag) return; if (!pProf->inCamProfiles || pProf->inAlternateLensID || pProf->inAlternateLensNames || *pProf->inInvalidTag) return;
// Check if it contains non-whitespaces (there are several calls to this for one tag unfortunately) // Check if it contains non-whitespaces (there are several calls to this for one tag unfortunately)
bool onlyWhiteSpace=true; bool onlyWhiteSpace=true;
@@ -588,8 +589,8 @@ void XMLCALL LCPProfile::XmlTextHandler(void *pLCPProfile, const XML_Char *s, in
pProf->pCurCommon->scaleFac=atof(raw); pProf->pCurCommon->scaleFac=atof(raw);
else if (!strcmp("ResidualMeanError",tag)) else if (!strcmp("ResidualMeanError",tag))
pProf->pCurCommon->meanErr=atof(raw); pProf->pCurCommon->meanErr=atof(raw);
else if (!strcmp("RadialDistortParam1",tag) || !strcmp("VignetteModelParam1",tag)) else if (!strcmp("RadialDistortParam1",tag) || !strcmp("VignetteModelParam1",tag))
pProf->pCurCommon->param[0]=atof(raw); pProf->pCurCommon->param[0]=atof(raw);
else if (!strcmp("RadialDistortParam2",tag) || !strcmp("VignetteModelParam2",tag)) else if (!strcmp("RadialDistortParam2",tag) || !strcmp("VignetteModelParam2",tag))
pProf->pCurCommon->param[1]=atof(raw); pProf->pCurCommon->param[1]=atof(raw);
else if (!strcmp("RadialDistortParam3",tag) || !strcmp("VignetteModelParam3",tag)) else if (!strcmp("RadialDistortParam3",tag) || !strcmp("VignetteModelParam3",tag))
@@ -611,8 +612,9 @@ void XMLCALL LCPProfile::XmlEndHandler(void *pLCPProfile, const char *el) {
if (strstr(el,":CameraProfiles")) pProf->inCamProfiles=false; if (strstr(el,":CameraProfiles")) pProf->inCamProfiles=false;
if (strstr(el,":AlternateLensIDs")) pProf->inAlternateLensID=false; if (strstr(el,":AlternateLensIDs")) pProf->inAlternateLensID=false;
if (strstr(el,":AlternateLensNames")) pProf->inAlternateLensNames=false;
if (!pProf->inCamProfiles || pProf->inAlternateLensID) return; if (!pProf->inCamProfiles || pProf->inAlternateLensID || pProf->inAlternateLensNames) return;
if (strstr(el,":PerspectiveModel") || strstr(el,":FisheyeModel")) if (strstr(el,":PerspectiveModel") || strstr(el,":FisheyeModel"))
pProf->inPerspect=false; pProf->inPerspect=false;

2
rtengine/lcp.h
View File

@@ -63,7 +63,7 @@ namespace rtengine {
class LCPProfile { class LCPProfile {
// Temporary data for parsing // Temporary data for parsing
bool inCamProfiles,firstLIDone,inPerspect,inAlternateLensID; bool inCamProfiles,firstLIDone,inPerspect,inAlternateLensID,inAlternateLensNames;
char lastTag[256],inInvalidTag[256]; char lastTag[256],inInvalidTag[256];
LCPPersModel* pCurPersModel; LCPPersModel* pCurPersModel;
LCPModelCommon* pCurCommon; LCPModelCommon* pCurCommon;