potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

core: std::string more changes

Browse Source
This commit is contained in:
Alexander Alekhin
2018-08-23 18:17:04 +03:00
parent ae8dcdf40d
commit 7f73b105ca
11 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/command_line_parser.cpp
+1 -6
View File
@@ -72,14 +72,9 @@ static const char* get_type_name(int type)
return "unknown";
}
// std::tolower is int->int
static char char_tolower(char ch)
{
return (char)std::tolower((int)ch);
}
static bool parse_bool(std::string str)
{
std::transform(str.begin(), str.end(), str.begin(), char_tolower);
std::transform(str.begin(), str.end(), str.begin(), details::char_tolower);
std::istringstream is(str);
bool b;
is >> (str.size() > 1 ? std::boolalpha : std::noboolalpha) >> b;
modules/core/src/ocl.cpp
+1 -6
View File
@@ -1691,11 +1691,6 @@ static cl_device_id selectOpenCLDevice()
return NULL;
}
#else
// std::tolower is int->int
static char char_tolower(char ch)
{
return (char)std::tolower((int)ch);
}
static cl_device_id selectOpenCLDevice()
{
std::string platform, deviceName;
@@ -1780,7 +1775,7 @@ static cl_device_id selectOpenCLDevice()
{
int deviceType = 0;
std::string tempStrDeviceType = deviceTypes[t];
std::transform(tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), char_tolower);
std::transform(tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), details::char_tolower);
if (tempStrDeviceType == "gpu" || tempStrDeviceType == "dgpu" || tempStrDeviceType == "igpu")
deviceType = Device::TYPE_GPU;
modules/core/src/persistence_cpp.cpp
-5
View File
@@ -667,11 +667,6 @@ void read(const FileNode& node, double& value, double default_value)
CV_NODE_IS_REAL(node.node->tag) ? node.node->data.f : std::numeric_limits<double>::max();
}
void read(const FileNode& node, String& value, const String& default_value)
{
value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? String(node.node->data.str.ptr) : String();
}
void read(const FileNode& node, std::string& value, const std::string& default_value)
{
value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? std::string(node.node->data.str.ptr) : default_value;
modules/core/src/system.cpp
+1 -1
View File
@@ -1970,7 +1970,7 @@ public:
const Ipp64u minorFeatures = 0;
#endif
env = env.toLowerCase();
env = toLowerCase(env);
if(env.substr(0, 2) == "ne")
{
useIPP_NE = true;