diff --git a/src/mat_io_test.cpp b/src/mat_io_test.cpp index 7bb57b2..c06760c 100644 --- a/src/mat_io_test.cpp +++ b/src/mat_io_test.cpp @@ -30,7 +30,7 @@ main( ) // Mat img1 = imread( "/home/gao/ws/devel/lib/camera_model/image_down/IMG_35.png", // CV_LOAD_IMAGE_GRAYSCALE ); - Mat img1 = imread( "/home/gao/IMG_1.png", CV_LOAD_IMAGE_UNCHANGED ); + Mat img1 = imread( "/home/gao/IMG_1.png", cv::IMREAD_UNCHANGED ); cv::resize( img1, img, cv::Size( 640, 512 ) ); diff --git a/src/sumpixel_test.cpp b/src/sumpixel_test.cpp index 48488e3..f476226 100644 --- a/src/sumpixel_test.cpp +++ b/src/sumpixel_test.cpp @@ -1,5 +1,5 @@ #define BACKWARD_HAS_DW 1 -#include "backward.hpp" +#include "code_utils/backward.hpp" namespace backward { backward::SignalHandling sh; @@ -81,7 +81,7 @@ void test1( ) { Mat img; - Mat img1 = imread( "/home/gao/IMG_1.png", CV_LOAD_IMAGE_GRAYSCALE ); + Mat img1 = imread( "/home/gao/IMG_1.png", cv::IMREAD_GRAYSCALE ); sys_utils::tic::TicTocPart time; @@ -91,7 +91,7 @@ test1( ) std::cout << "sumPixelRow cost " << time.toc( ) << " ms\n"; cv::Mat img2; - normalize( img, img2, 0, 255, CV_MINMAX ); + normalize( img, img2, 0, 255, cv::NORM_MINMAX ); Mat imageIntegralNorm; convertScaleAbs( img2, imageIntegralNorm ); @@ -104,7 +104,7 @@ void test2( ) { Mat img; - Mat img1 = imread( "/home/gao/IMG_1.png", CV_LOAD_IMAGE_GRAYSCALE ); + Mat img1 = imread( "/home/gao/IMG_1.png", cv::IMREAD_GRAYSCALE ); sys_utils::tic::TicTocPart time; @@ -114,7 +114,7 @@ test2( ) std::cout << "sumPixelRow cost " << time.toc( ) << " ms\n"; cv::Mat img2; - normalize( img, img2, 0, 255, CV_MINMAX ); + normalize( img, img2, 0, 255, cv::NORM_MINMAX ); Mat imageIntegralNorm; convertScaleAbs( img2, imageIntegralNorm );