fix build problems on Windows

pull/13383/head
Vadim Pisarevsky 14 years ago
parent 0f5f60f7f5
commit 3d154c9dde
  1. 16
      modules/core/include/opencv2/core/core.hpp
  2. 2
      modules/core/src/CommandLineParser.cpp

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

@ -32,7 +32,7 @@ void PreprocessArgs(int _argc, const char* _argv[], int& argc, char**& argv)
find_symbol = buffer_string.find('=');
if (find_symbol == -1)
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_vector.push_back(buffer_string);

Loading…
Cancel
Save