2019-08-24 22:49:32 +00:00
|
|
|
diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp
|
|
|
|
|
index dc7605b..56f59db 100644
|
|
|
|
|
--- a/src/ImageConverter.cpp
|
|
|
|
|
+++ b/src/ImageConverter.cpp
|
|
|
|
|
@@ -70,7 +70,7 @@ void ImageConverter::convert(const cv::Mat * in, QImage * out)
|
2018-11-24 13:40:19 +00:00
|
|
|
|
2019-08-24 22:49:32 +00:00
|
|
|
cv::Mat tmp(in->cols, in->rows, in->depth());
|
|
|
|
|
|
|
|
|
|
- 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<unsigned char *>(tmp.ptr());
|
|
|
|
|
@@ -106,7 +106,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<float> & in, QImage * out)
|
