From: <tm...@us...> - 2009-10-02 05:58:57
|
Revision: 4549 http://hugin.svn.sourceforge.net/hugin/?rev=4549&view=rev Author: tmodes Date: 2009-10-02 05:58:50 +0000 (Fri, 02 Oct 2009) Log Message: ----------- Fixes writing of project file output of calibrate_lens Modified Paths: -------------- hugin/releases/2009.4/src/lens_calibrate/Main.cpp Modified: hugin/releases/2009.4/src/lens_calibrate/Main.cpp =================================================================== --- hugin/releases/2009.4/src/lens_calibrate/Main.cpp 2009-10-02 05:56:01 UTC (rev 4548) +++ hugin/releases/2009.4/src/lens_calibrate/Main.cpp 2009-10-02 05:58:50 UTC (rev 4549) @@ -175,7 +175,7 @@ } // Print the top of the file - for (unsigned int l = 0; l < pto_file_top.size() - 1; l++){ + for (unsigned int l = 0; l < pto_file_top.size(); l++){ out << pto_file_top[l] << endl; } for (unsigned int l = 0; l < pto_file_cps.size(); l++){ @@ -190,11 +190,11 @@ unsigned int line_count = l+3; - double interval = lines[l].size()/cps_per_line; + double interval = (lines[l].size()-1)/(1.0*cps_per_line); for(int i = 0; i < cps_per_line; i++){ - int start = i * (int)interval; - int stop = (i+1) * (int)interval; + int start = (int)(i * interval); + int stop = (int)((i+1) * interval); //cout << l << ":" << i << " - " << start << ": " << lines[l][start]->x << " - " << start << ":" << lines[l][start]->y << endl; //cout << l << ":" << i << " - " << stop << ": " << lines[l][start]->x << " - " << stop << ":" << lines[l][stop]->y << endl << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-10-25 00:11:46
|
Revision: 4669 http://hugin.svn.sourceforge.net/hugin/?rev=4669&view=rev Author: yuv Date: 2009-10-25 00:11:39 +0000 (Sun, 25 Oct 2009) Log Message: ----------- applying trunk/4646 Modified Paths: -------------- hugin/releases/2009.4/src/lens_calibrate/Main.cpp Modified: hugin/releases/2009.4/src/lens_calibrate/Main.cpp =================================================================== --- hugin/releases/2009.4/src/lens_calibrate/Main.cpp 2009-10-24 20:03:15 UTC (rev 4668) +++ hugin/releases/2009.4/src/lens_calibrate/Main.cpp 2009-10-25 00:11:39 UTC (rev 4669) @@ -441,7 +441,7 @@ //cout << " -b <float> Boundary tensor scale. Default 1.45" << endl; //cout << " -b <float> Boundary tensor threshold. Default 75" << endl; //cout << " -g <int> Gap in pixels permitted within a line. Default 4" << endl; - cout << " -m <float> Minimum line length as a fraction of longest dimension. Default 0.1" << endl; + cout << " -m <float> Minimum line length as a fraction of longest dimension. Default 0.3" << endl; //cout << " -m <float> Sigma parameter for hourglass filter. Default 1.4" << endl; cout << " -y <float> Corner threshold. Default 150" << endl; //cout << " -i <float> Pixel density in pixels/inch. Default 4000" << endl; @@ -461,7 +461,7 @@ // cout << " 3 = add cubic & quintic (a,b,c,d)" << endl; //cout << " -i <0|1> Generate intermediate images. Default 1" << endl; - cout << " -z <0|1> Optimise image centre. Default 1" << endl; + cout << " -z <0|1> Optimise image centre. Default 0" << endl; // cout << " -w <0|1> Straighten image using vertical lines. Skips lens optimisation. Default 0" << endl; cout << " -v <0|1> Verbose. Default 0" << endl; cout << " -h Print usage." << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |