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

samples: avoid using of legacy C-like API (part 2)

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-29 14:17:23 +03:00
parent 7dc88f26f2
commit e28cc973bf
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp
+5 -5
View File
@@ -47,7 +47,7 @@ MainPage::MainPage()
// Image loading OpenCV way ... way more simple
cv::Mat image = cv::imread("Assets/Lena.png");
Lena = cv::Mat(image.rows, image.cols, CV_8UC4);
cvtColor(image, Lena, CV_BGR2BGRA);
cvtColor(image, Lena, COLOR_BGR2BGRA);
UpdateImage(Lena);
#else
@@ -184,8 +184,8 @@ cv::Mat OcvImageProcessing::MainPage::ApplyGrayFilter(const cv::Mat& image)
{
cv::Mat result;
cv::Mat intermediateMat;
cv::cvtColor(image, intermediateMat, CV_RGBA2GRAY);
cv::cvtColor(intermediateMat, result, CV_GRAY2BGRA);
cv::cvtColor(image, intermediateMat, COLOR_RGBA2GRAY);
cv::cvtColor(intermediateMat, result, COLOR_GRAY2BGRA);
return result;
}
@@ -194,7 +194,7 @@ cv::Mat OcvImageProcessing::MainPage::ApplyCannyFilter(const cv::Mat& image)
cv::Mat result;
cv::Mat intermediateMat;
cv::Canny(image, intermediateMat, 80, 90);
cv::cvtColor(intermediateMat, result, CV_GRAY2BGRA);
cv::cvtColor(intermediateMat, result, COLOR_GRAY2BGRA);
return result;
}
@@ -213,7 +213,7 @@ cv::Mat OcvImageProcessing::MainPage::ApplyFindFeaturesFilter(const cv::Mat& ima
std::vector<cv::KeyPoint> features;
image.copyTo(result);
cv::cvtColor(image, intermediateMat, CV_RGBA2GRAY);
cv::cvtColor(image, intermediateMat, COLOR_RGBA2GRAY);
detector->detect(intermediateMat, features);
for( unsigned int i = 0; i < std::min(features.size(), (size_t)50); i++ )