Merge pull request opencv#9746 from alalek:fix_msvs2017_warning

vpisarev · vpisarev · commit eca5906a75d7 · 2017-10-02T11:15:48.000Z
diff --git a/modules/calib3d/src/fisheye.cpp b/modules/calib3d/src/fisheye.cpp
@@ -928,7 +928,7 @@ double cv::fisheye::stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayO
     intrinsicRight_errors.isEstimate = intrinsicRight.isEstimate;
 
     std::vector<uchar> selectedParams;
-    std::vector<int> tmp(6 * (n_images + 1), 1);
+    std::vector<uchar> tmp(6 * (n_images + 1), 1);
     selectedParams.insert(selectedParams.end(), intrinsicLeft.isEstimate.begin(), intrinsicLeft.isEstimate.end());
     selectedParams.insert(selectedParams.end(), intrinsicRight.isEstimate.begin(), intrinsicRight.isEstimate.end());
     selectedParams.insert(selectedParams.end(), tmp.begin(), tmp.end());
diff --git a/modules/core/src/command_line_parser.cpp b/modules/core/src/command_line_parser.cpp
@@ -69,9 +69,14 @@ 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(), ::tolower);
+    std::transform(str.begin(), str.end(), str.begin(), char_tolower);
     std::istringstream is(str);
     bool b;
     is >> (str.size() > 1 ? std::boolalpha : std::noboolalpha) >> b;
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -993,6 +993,11 @@ 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;
@@ -1077,7 +1082,7 @@ static cl_device_id selectOpenCLDevice()
     {
         int deviceType = 0;
         std::string tempStrDeviceType = deviceTypes[t];
-        std::transform( tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), tolower );
+        std::transform(tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), char_tolower);
 
         if (tempStrDeviceType == "gpu" || tempStrDeviceType == "dgpu" || tempStrDeviceType == "igpu")
             deviceType = Device::TYPE_GPU;
diff --git a/modules/stitching/src/exposure_compensate.cpp b/modules/stitching/src/exposure_compensate.cpp
@@ -63,7 +63,7 @@ void ExposureCompensator::feed(const std::vector<Point> &corners, const std::vec
 {
     std::vector<std::pair<UMat,uchar> > level_masks;
     for (size_t i = 0; i < masks.size(); ++i)
-        level_masks.push_back(std::make_pair(masks[i], 255));
+        level_masks.push_back(std::make_pair(masks[i], (uchar)255));
     feed(corners, images, level_masks);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,11 @@ static cl_device_id selectOpenCLDevice()`
`993`	`993`	`return NULL;`
`994`	`994`	`}`
`995`	`995`	`#else`
	`996`	`+// std::tolower is int->int`
	`997`	`+static char char_tolower(char ch)`
	`998`	`+{`
	`999`	`+ return (char)std::tolower((int)ch);`
	`1000`	`+}`
`996`	`1001`	`static cl_device_id selectOpenCLDevice()`
`997`	`1002`	`{`
`998`	`1003`	`std::string platform, deviceName;`
`@@ -1077,7 +1082,7 @@ static cl_device_id selectOpenCLDevice()`
`1077`	`1082`	`{`
`1078`	`1083`	`int deviceType = 0;`
`1079`	`1084`	`std::string tempStrDeviceType = deviceTypes[t];`
`1080`		`- std::transform( tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), tolower );`
	`1085`	`+ std::transform(tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), char_tolower);`
`1081`	`1086`
`1082`	`1087`	`if (tempStrDeviceType == "gpu" \|\| tempStrDeviceType == "dgpu" \|\| tempStrDeviceType == "igpu")`
`1083`	`1088`	`deviceType = Device::TYPE_GPU;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void ExposureCompensator::feed(const std::vector<Point> &corners, const std::vec`
`63`	`63`	`{`
`64`	`64`	`std::vector<std::pair<UMat,uchar> > level_masks;`
`65`	`65`	`for (size_t i = 0; i < masks.size(); ++i)`
`66`		`- level_masks.push_back(std::make_pair(masks[i], 255));`
	`66`	`+ level_masks.push_back(std::make_pair(masks[i], (uchar)255));`
`67`	`67`	`feed(corners, images, level_masks);`
`68`	`68`	`}`
`69`	`69`