From 6ca1964690afbbc78627d7c868a692401043a584 Mon Sep 17 00:00:00 2001 From: Sebastien Fourey Date: Sat, 25 Apr 2020 12:00:16 +0200 Subject: [PATCH] Replace obsolete opencv constants (4.2.0) --- src/ImageConverter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp index bb785c9..901960d 100644 --- a/src/ImageConverter.cpp +++ b/src/ImageConverter.cpp @@ -70,7 +70,7 @@ void ImageConverter::convert(const cv::Mat * in, QImage * out) cv::Mat tmp(in->cols, in->rows, in->type()); - cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); + cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); const unsigned int w3 = 3 * tmp.cols; unsigned char * src = reinterpret_cast(tmp.ptr()); @@ -113,7 +113,7 @@ void ImageConverter::convert(const QImage & in, cv::Mat ** out) dst += step; } } - cvtColor(**out, **out, CV_BGR2RGB); + cvtColor(**out, **out, cv::COLOR_BGR2RGB); } void ImageConverter::convert(const cimg_library::CImg & in, QImage * out)