gmic/gmic_opencv.patch
2020-03-30 21:25:27 +02:00

21 lines
731 B
Diff

--- gmic-2.9.0/zart/src/ImageConverter.cpp.orig 2020-03-30 17:06:35.000000000 +0200
+++ gmic-2.9.0/zart/src/ImageConverter.cpp 2020-03-30 21:19:39.589129422 +0200
@@ -70,7 +70,7 @@
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<unsigned char *>(tmp.ptr());
@@ -113,7 +113,7 @@
dst += step;
}
}
- cvtColor(**out, **out, CV_BGR2RGB);
+ cvtColor(**out, **out, cv::COLOR_BGR2RGB);
}
void ImageConverter::convert(const cimg_library::CImg<float> & in, QImage * out)