提交 c2e5d5d2 编写于 作者: G gineshidalgo99

Working on OpenCV3.3-rc

上级 0533e790
...@@ -31,7 +31,7 @@ namespace op ...@@ -31,7 +31,7 @@ namespace op
// float* (deep net format): C x H x W // float* (deep net format): C x H x W
// cv::Mat (OpenCV format): H x W x C // cv::Mat (OpenCV format): H x W x C
if (cvMat.rows != resolutionSize.y || cvMat.cols != resolutionSize.x || cvMat.type() != CV_8UC3) if (cvMat.rows != resolutionSize.y || cvMat.cols != resolutionSize.x || cvMat.type() != CV_8UC3)
cvMat = cv::Mat{resolutionSize.y, resolutionSize.x, CV_8UC3}; cvMat = cv::Mat(resolutionSize.y, resolutionSize.x, CV_8UC3);
const auto offsetBetweenChannels = resolutionSize.x * resolutionSize.y; const auto offsetBetweenChannels = resolutionSize.x * resolutionSize.y;
for (auto c = 0; c < resolutionChannels; c++) for (auto c = 0; c < resolutionChannels; c++)
{ {
...@@ -70,7 +70,7 @@ namespace op ...@@ -70,7 +70,7 @@ namespace op
// Allocate cv::Mat // Allocate cv::Mat
if (cvMatResult.cols != channels * width || cvMatResult.rows != height) if (cvMatResult.cols != channels * width || cvMatResult.rows != height)
cvMatResult = cv::Mat{height, areaOutput, CV_8UC1}; cvMatResult = cv::Mat(height, areaOutput, CV_8UC1);
// Fill cv::Mat // Fill cv::Mat
for (auto channel = 0 ; channel < channels ; channel++) for (auto channel = 0 ; channel < channels ; channel++)
...@@ -93,7 +93,7 @@ namespace op ...@@ -93,7 +93,7 @@ namespace op
} }
} }
else else
cvMatResult = cv::Mat{}; cvMatResult = cv::Mat();
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册