From 1ecf91785e30f2f01107af3755a5f23fb11e4198 Mon Sep 17 00:00:00 2001 From: Rishhanth Date: Wed, 16 May 2018 12:29:22 +0530 Subject: [PATCH] Updated ImageRW_OpenCV.cpp to build with the latest versions of OpenCV --- src/IOWrapper/OpenCV/ImageRW_OpenCV.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/IOWrapper/OpenCV/ImageRW_OpenCV.cpp b/src/IOWrapper/OpenCV/ImageRW_OpenCV.cpp index 170cb33ce..a7ba9b77b 100644 --- a/src/IOWrapper/OpenCV/ImageRW_OpenCV.cpp +++ b/src/IOWrapper/OpenCV/ImageRW_OpenCV.cpp @@ -34,7 +34,7 @@ namespace IOWrap { MinimalImageB* readImageBW_8U(std::string filename) { - cv::Mat m = cv::imread(filename, CV_LOAD_IMAGE_GRAYSCALE); + cv::Mat m = cv::imread(filename, cv::IMREAD_GRAYSCALE); if(m.rows*m.cols==0) { printf("cv::imread could not read image %s! this may segfault. \n", filename.c_str()); @@ -52,7 +52,7 @@ MinimalImageB* readImageBW_8U(std::string filename) MinimalImageB3* readImageRGB_8U(std::string filename) { - cv::Mat m = cv::imread(filename, CV_LOAD_IMAGE_COLOR); + cv::Mat m = cv::imread(filename, CV::IMREAD_COLOR); if(m.rows*m.cols==0) { printf("cv::imread could not read image %s! this may segfault. \n", filename.c_str()); @@ -70,7 +70,7 @@ MinimalImageB3* readImageRGB_8U(std::string filename) MinimalImage* readImageBW_16U(std::string filename) { - cv::Mat m = cv::imread(filename, CV_LOAD_IMAGE_UNCHANGED); + cv::Mat m = cv::imread(filename, cv::IMREAD_UNCHANGED); if(m.rows*m.cols==0) { printf("cv::imread could not read image %s! this may segfault. \n", filename.c_str()); @@ -88,7 +88,7 @@ MinimalImage* readImageBW_16U(std::string filename) MinimalImageB* readStreamBW_8U(char* data, int numBytes) { - cv::Mat m = cv::imdecode(cv::Mat(numBytes,1,CV_8U, data), CV_LOAD_IMAGE_GRAYSCALE); + cv::Mat m = cv::imdecode(cv::Mat(numBytes,1,CV_8U, data), cv::IMREAD_GRAYSCALE); if(m.rows*m.cols==0) { printf("cv::imdecode could not read stream (%d bytes)! this may segfault. \n", numBytes);