From: <bru...@us...> - 2008-10-13 20:07:17
|
Revision: 3499 http://hugin.svn.sourceforge.net/hugin/?rev=3499&view=rev Author: brunopostle Date: 2008-10-13 20:07:10 +0000 (Mon, 13 Oct 2008) Log Message: ----------- Fix error: first argument of ?\226?\128?\152int main(unsigned int, const char**)?\226?\128?\153 should be ?\226?\128?\152int?\226?\128?\153 bug #2161163 (Lukas Jirkovsky) Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2008-10-13 20:04:09 UTC (rev 3498) +++ hugin/trunk/src/celeste/Main.cpp 2008-10-13 20:07:10 UTC (rev 3499) @@ -413,7 +413,7 @@ } -int main(unsigned int argc, const char* argv[]){ +int main(int argc, const char* argv[]){ // Exit with usage unless filename given as argument if (argc < 2){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bl...@us...> - 2008-11-18 18:09:38
|
Revision: 3562 http://hugin.svn.sourceforge.net/hugin/?rev=3562&view=rev Author: blimbo Date: 2008-11-18 18:09:36 +0000 (Tue, 18 Nov 2008) Log Message: ----------- minor changes to celeste_standalone Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2008-11-18 17:38:17 UTC (rev 3561) +++ hugin/trunk/src/celeste/Main.cpp 2008-11-18 18:09:36 UTC (rev 3562) @@ -299,12 +299,12 @@ } // Process last image - create mask if necessary - if (images.size() > 1){ + //if (images.size() > 1){ - gNumLocs = 0; - get_gabor_response(images.back(),mask,m,threshold,mask_format,svm_responses); + // gNumLocs = 0; + // get_gabor_response(images.back(),mask,m,threshold,mask_format,svm_responses); - } + //} // Close stream is.close(); @@ -544,7 +544,7 @@ if (pto_file != ("")){ cout << "Parsing Hugin project file " << pto_file << endl << endl; - cout << "Classifying control points using SVM..." << endl << endl; + parse_pto(pto_file,images,pto_file_top,pto_file_cps,pto_file_end,mask,model_file,threshold,mask_format,svm_responses); // Prune CPs and write new pto file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bl...@us...> - 2009-03-19 13:07:20
|
Revision: 3751 http://hugin.svn.sourceforge.net/hugin/?rev=3751&view=rev Author: blimbo Date: 2009-03-19 13:07:06 +0000 (Thu, 19 Mar 2009) Log Message: ----------- small fix for whitespace issue with celeste_standalone Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2009-03-19 06:27:30 UTC (rev 3750) +++ hugin/trunk/src/celeste/Main.cpp 2009-03-19 13:07:06 UTC (rev 3751) @@ -355,13 +355,16 @@ } //cout << pto_file_cps[l] << "\t"; + + unsigned int l = 1; + int t = 80 - len; + if (t > 0) l = t; + + for (int s = 0; s < l; s++){ - for (unsigned int s = 0; s < 60 - len; s++){ cout << " "; } - - if (svm_responses[l] >= threshold){ cout << "Removed (score " << svm_responses[l] << " >= " << threshold << ")" << endl; }else{ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-07-28 05:29:18
|
Revision: 4120 http://hugin.svn.sourceforge.net/hugin/?rev=4120&view=rev Author: tmodes Date: 2009-07-28 05:29:08 +0000 (Tue, 28 Jul 2009) Log Message: ----------- Bugfix for celeste_standalone Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2009-07-27 22:59:48 UTC (rev 4119) +++ hugin/trunk/src/celeste/Main.cpp 2009-07-28 05:29:08 UTC (rev 4120) @@ -356,11 +356,11 @@ //cout << pto_file_cps[l] << "\t"; - unsigned int l = 1; + unsigned int count_spaces = 1; int t = 80 - len; - if (t > 0) l = t; + if (t > 0) count_spaces = t; - for (int s = 0; s < l; s++){ + for (unsigned int s = 0; s < count_spaces; s++){ cout << " "; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-07-31 05:25:50
|
Revision: 4131 http://hugin.svn.sourceforge.net/hugin/?rev=4131&view=rev Author: tmodes Date: 2009-07-31 05:25:37 +0000 (Fri, 31 Jul 2009) Log Message: ----------- Fixes finding of model file in celeste_standalone [2828222] Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2009-07-31 01:57:13 UTC (rev 4130) +++ hugin/trunk/src/celeste/Main.cpp 2009-07-31 05:25:37 UTC (rev 4131) @@ -33,6 +33,10 @@ #include <sys/stat.h> #include "hugin_config.h" +#ifdef __WIN32__ +#include <windows.h> +#endif + #define VERSION 1.2 using namespace std; @@ -466,7 +470,30 @@ // Check model file if (!fileexists(model_file)){ - string install_path_model = (INSTALL_DATA_DIR); +#if __WIN32__ + char buffer[MAX_PATH];//always use MAX_PATH for filepaths + GetModuleFileName(NULL,buffer,sizeof(buffer)); + string working_path=(buffer); + string install_path_model=""; + //remove filename + std::string::size_type pos=working_path.rfind("\\"); + if(pos!=std::string::npos) + { + working_path.erase(pos); + //remove last dir: should be bin + pos=working_path.rfind("\\"); + if(pos!=std::string::npos) + { + working_path.erase(pos); + //append path delimiter and path + working_path.append("\\share\\hugin\\data\\"); + install_path_model=working_path; + } + } +#else + string install_path_model = (INSTALL_DATA_DIR); +#endif + install_path_model.append(model_file); if (!fileexists(install_path_model)){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-12-01 21:26:27
|
Revision: 4740 http://hugin.svn.sourceforge.net/hugin/?rev=4740&view=rev Author: brunopostle Date: 2009-12-01 21:26:20 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Fix pto parsing for celeste_standalone a bit (Felix Hagemann) Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2009-12-01 19:48:07 UTC (rev 4739) +++ hugin/trunk/src/celeste/Main.cpp 2009-12-01 21:26:20 UTC (rev 4740) @@ -124,8 +124,8 @@ // Hugin files if (start == ("i")){ - found = line.find("\""); - imagename = line.substr(found + 1, line.length() - found - 2); + found = line.find("n\""); + imagename = line.substr(found + 2, line.find("\"",found + 2) - found - 2); //cout << imagename << endl; // (Old?) Autopano Pro files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-12-03 00:02:35
|
Revision: 4746 http://hugin.svn.sourceforge.net/hugin/?rev=4746&view=rev Author: brunopostle Date: 2009-12-03 00:02:29 +0000 (Thu, 03 Dec 2009) Log Message: ----------- Fix c line parsing for celeste_standalone (Felix Hagemann) Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2009-12-02 20:17:38 UTC (rev 4745) +++ hugin/trunk/src/celeste/Main.cpp 2009-12-03 00:02:29 UTC (rev 4746) @@ -238,26 +238,33 @@ // First CP of next image - // Control point x - unsigned int xcp = atoi( tokens[3].substr(1, tokens[3].length()-1).c_str() ); + // Control point x,y + unsigned int xcp, ycp; + for ( int i = 0; i < tokens.size(); i++) + { + if (tokens[i][0] == 'x') + xcp = atoi( tokens[i].substr(1, tokens[i].length()-1).c_str() ); + else if (tokens[i][0] == 'y') + ycp = atoi( tokens[i].substr(1, tokens[i].length()-1).c_str() ); + } + xcps.push_back(xcp); - - // Control point y - unsigned int ycp = atoi( tokens[4].substr(1, tokens[4].length()-1).c_str() ); ycps.push_back(ycp); counter = 1; }else{ - - // Control point x - unsigned int xcp = atoi( tokens[3].substr(1, tokens[3].length()-1).c_str() ); + unsigned int xcp, ycp; + for ( int i = 0; i < tokens.size(); i++) + { + if (tokens[i][0] == 'x') + xcp = atoi( tokens[i].substr(1, tokens[i].length()-1).c_str() ); + else if (tokens[i][0] == 'y') + ycp = atoi( tokens[i].substr(1, tokens[i].length()-1).c_str() ); + } + ycps.push_back(ycp); xcps.push_back(xcp); - // Control point y - unsigned int ycp = atoi( tokens[4].substr(1, tokens[4].length()-1).c_str() ); - ycps.push_back(ycp); - counter++; //cout << images[image_no] << " : " << xcp << "," << ycp << endl; @@ -352,7 +359,7 @@ cout << "CP "; unsigned int len = 0; - for (unsigned int t = 1; t < 7; t++){ + for (unsigned int t = 1; t < tokens.size(); t++){ len += tokens[t].length(); cout << tokens[t] << " "; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-12-03 22:59:55
|
Revision: 4747 http://hugin.svn.sourceforge.net/hugin/?rev=4747&view=rev Author: brunopostle Date: 2009-12-03 22:59:45 +0000 (Thu, 03 Dec 2009) Log Message: ----------- celeste_standalone now returns 0 on success instead of 1 Modified Paths: -------------- hugin/trunk/src/celeste/Main.cpp Modified: hugin/trunk/src/celeste/Main.cpp =================================================================== --- hugin/trunk/src/celeste/Main.cpp 2009-12-03 00:02:29 UTC (rev 4746) +++ hugin/trunk/src/celeste/Main.cpp 2009-12-03 22:59:45 UTC (rev 4747) @@ -589,6 +589,6 @@ } - return(1); + return(0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |