Mercurial Hosting > traffic-intelligence
diff c/Parameters.cpp @ 231:249d65ff6c35
merged modifications for windows
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 02 Jul 2012 23:49:39 -0400 |
parents | bc4ea09b1743 6e73b112370b |
children | f21ef87f98f1 |
line wrap: on
line diff
--- a/c/Parameters.cpp Fri Jun 29 16:15:13 2012 -0400 +++ b/c/Parameters.cpp Mon Jul 02 23:49:39 2012 -0400 @@ -9,7 +9,7 @@ using namespace std; KLTFeatureTrackingParameters::KLTFeatureTrackingParameters(const int argc, char* argv[]) { - std::string configurationFilename; + string configurationFilename; po::options_description onlyCmdLine("Command line only"); po::options_description cmdLineAndFile("Command line and configuration file"); @@ -33,8 +33,8 @@ ("load-features", po::value<bool>(&loadFeatures), "load features from database") ("display", po::value<bool>(&display), "display trajectories on the video") ("video-fps", po::value<float>(&videoFPS), "original video frame rate") - ("frame1", po::value<int>(&frame1), "first frame to process") - ("nframes", po::value<int>(&nFrames), "number of frame to process") + ("frame1", po::value<unsigned int>(&frame1), "first frame to process") + ("nframes", po::value<unsigned int>(&nFrames), "number of frame to process") // feature tracking ("max-nfeatures", po::value<int>(&maxNFeatures), "maximum number of features added at each frame") ("feature-quality", po::value<float>(&featureQuality), "quality level of the good features to track") @@ -95,7 +95,7 @@ string KLTFeatureTrackingParameters::getParameterDescription(po::options_description& options, const po::variables_map& vm, const string& separator /* = " " */) const { stringstream stream; - std::vector<boost::shared_ptr<po::option_description> > optionsVec = options.options(); + vector<boost::shared_ptr<po::option_description> > optionsVec = options.options(); for (unsigned int i=0; i<optionsVec.size(); ++i) { boost::any value = vm[optionsVec[i]->long_name()].value(); if (value.type() == typeid(bool))