Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix opencv4 + sumpixel.cpp include #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mat_io_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );

Expand Down
10 changes: 5 additions & 5 deletions src/sumpixel_test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define BACKWARD_HAS_DW 1
#include "backward.hpp"
#include "code_utils/backward.hpp"
namespace backward
{
backward::SignalHandling sh;
Expand Down Expand Up @@ -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;

Expand All @@ -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 );

Expand All @@ -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;

Expand All @@ -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 );

Expand Down