Menu
▾
▴
[Hugin-cvs] hugin/src/Panorama PanoramaMemento.cpp, 1.89, 1.90 PhotometricOptimizer.cpp, 1.2, 1.3
|
From: Pablo d'A. <da...@us...> - 2007-05-10 06:26:51
|
Update of /cvsroot/hugin/hugin/src/Panorama In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14162/src/Panorama Modified Files: PanoramaMemento.cpp PhotometricOptimizer.cpp Log Message: fixed crash when photometrically optimizing images with different size reset vignetting correction values when loading old projects Index: PhotometricOptimizer.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/Panorama/PhotometricOptimizer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PhotometricOptimizer.cpp 8 May 2007 22:48:59 -0000 1.2 +++ PhotometricOptimizer.cpp 10 May 2007 06:26:45 -0000 1.3 @@ -33,7 +33,7 @@ #include "common/stl_utils.h" #ifdef DEBUG -//#define DEBUG_LOG_VIG 1 +#define DEBUG_LOG_VIG 1 #endif using namespace PT; Index: PanoramaMemento.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoramaMemento.cpp,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- PanoramaMemento.cpp 17 Apr 2007 07:25:32 -0000 1.89 +++ PanoramaMemento.cpp 10 May 2007 06:26:45 -0000 1.90 @@ -72,7 +72,7 @@ vars.insert(pair<const char*, Variable>("g",Variable("g",0))); vars.insert(pair<const char*, Variable>("t",Variable("t",0))); - vars.insert(pair<const char*, Variable>("Va",Variable("Va",0))); + vars.insert(pair<const char*, Variable>("Va",Variable("Va",1))); vars.insert(pair<const char*, Variable>("Vb",Variable("Vb",0))); vars.insert(pair<const char*, Variable>("Vc",Variable("Vc",0))); vars.insert(pair<const char*, Variable>("Vd",Variable("Vd",0))); @@ -104,7 +104,7 @@ variables.insert(pair<const char*, LensVariable>("t",LensVariable("t", 0.0, true))); // vignetting correction variables - variables.insert(pair<const char*, LensVariable>("Va",LensVariable("Va", 0.0, true))); + variables.insert(pair<const char*, LensVariable>("Va",LensVariable("Va", 1.0, true))); variables.insert(pair<const char*, LensVariable>("Vb",LensVariable("Vb", 0.0, true))); variables.insert(pair<const char*, LensVariable>("Vc",LensVariable("Vc", 0.0, true))); variables.insert(pair<const char*, LensVariable>("Vd",LensVariable("Vd", 0.0, true))); @@ -912,7 +912,8 @@ width = -1; height = -1; f = -2; - vigcorrMode = 5; // default to radial correction by division + vigcorrMode = 0; // default to no correction + // is transformed to correction by division later responseType = 0; // default to EMOR for (char ** v = varnames; *v != 0; v++) { vars[*v] = 0; @@ -943,6 +944,16 @@ getIntParam(height, line, "h"); getIntParam(vigcorrMode, line, "Vm"); + // HACK: force Va1, for all images that use the a polynomial vig correction mode. + // reset to vignetting correction by division. + if (vigcorrMode != 5) { + vigcorrMode = 5; + vars["Va"] = 1.0; + vars["Vb"] = 0.0; + vars["Vc"] = 0.0; + vars["Vd"] = 0.0; + } + getIntParam(responseType, line, "Rt"); getPTStringParam(flatfieldname,line,"Vf"); @@ -965,6 +976,8 @@ DEBUG_WARN("Could not parse crop string: " << crop_str); } } + + } static char *varnames[]; @@ -989,9 +1002,9 @@ "Eev", "Er", "Eb", "Ra", "Rb", "Rc", "Rd", "Re", 0}; double ImgInfo::defaultValues[] = {51.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 1.0, - 0.0, 0.0, 0.0, 0.0, 0.0}; + 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 1.0, + 0.0, 0.0, 0.0, 0.0, 0.0}; bool PanoramaMemento::loadPTScript(std::istream &i, const std::string &prefix) { |