generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build problems on Windows

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-17 13:32:42 +00:00
parent 0f5f60f7f5
commit 3d154c9dde
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/core/include/opencv2/core/core.hpp
View File

@ -4178,7 +4178,7 @@ protected:
cv::Size size = parser.get<cv::Size>("--size"); cv::Size size = parser.get<cv::Size>("--size");
string inputFile = parser.get<string>("--inputFile"); string inputFile = parser.get<string>("--inputFile");
*/ */
class CommandLineParser class CV_EXPORTS CommandLineParser
{ {
public: public:
//! the default constructor //! the default constructor
@ -4257,10 +4257,10 @@ protected:
} }
}; };
template<> template<> CV_EXPORTS
std::vector<std::string> CommandLineParser::getVec<std::string>(const std::string& keys); std::vector<std::string> CommandLineParser::getVec<std::string>(const std::string& keys);
template<typename _Tp> template<typename _Tp> inline
std::vector<_Tp> CommandLineParser::getVec(const std::string& keys) std::vector<_Tp> CommandLineParser::getVec(const std::string& keys)
{ {
if (!has(keys)) if (!has(keys))
@ -4277,19 +4277,19 @@ std::vector<_Tp> CommandLineParser::getVec(const std::string& keys)
return res; return res;
} }
template<> template<> CV_EXPORTS
std::string CommandLineParser::fromString<std::string>(const std::string& str); std::string CommandLineParser::fromString<std::string>(const std::string& str);
template<> template<> CV_EXPORTS
int CommandLineParser::fromString<int>(const std::string& str); int CommandLineParser::fromString<int>(const std::string& str);
template<> template<> CV_EXPORTS
unsigned int CommandLineParser::fromString<unsigned int>(const std::string& str); unsigned int CommandLineParser::fromString<unsigned int>(const std::string& str);
template<> template<> CV_EXPORTS
double CommandLineParser::fromString<double>(const std::string& str); double CommandLineParser::fromString<double>(const std::string& str);
template<> template<> CV_EXPORTS
cv::Size CommandLineParser::fromStringsVec<cv::Size>(const std::vector<std::string>& str); cv::Size CommandLineParser::fromStringsVec<cv::Size>(const std::vector<std::string>& str);
} }

2
modules/core/src/CommandLineParser.cpp
View File

@ -32,7 +32,7 @@ void PreprocessArgs(int _argc, const char* _argv[], int& argc, char**& argv)
find_symbol = buffer_string.find('='); find_symbol = buffer_string.find('=');
if (find_symbol == -1) if (find_symbol == -1)
buffer_vector.push_back(buffer_string); buffer_vector.push_back(buffer_string);
else if (find_symbol == 0 || find_symbol == (buffer_string.length() - 1)) else if (find_symbol == 0 || find_symbol == ((int)buffer_string.length() - 1))
{ {
buffer_string.erase(find_symbol, (find_symbol + 1)); buffer_string.erase(find_symbol, (find_symbol + 1));
buffer_vector.push_back(buffer_string); buffer_vector.push_back(buffer_string);