rpms/gmic
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove patch1

Browse Source
This commit is contained in:
josef radinger 2020-06-12 09:26:01 +02:00
parent f4f344b139
commit db18bfc091
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gmic.spec
View File

@ -43,7 +43,6 @@ BuildRequires: gcc-c++
# package despite being a shared library
Obsoletes: gmic-static <= 2.1.8
Patch1: gmic_opencv.patch
Patch2: Makefile_arch.patch
@ -79,7 +78,6 @@ Provides a plugin for using G'MIC from GIMP
%prep
%setup -q -a 1 -a 2 -a 3
%patch1 -p1 -b.opencv
%ifarch armv7hl s390x ppc64le
%patch2 -p1 -b.arch
@ -167,6 +165,7 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic
%changelog
* Fri Jun 12 2020 josef radinger <cheese@nosuchhost.net> - 2.9.1-1
- bump version
- remove patch1 (for new opencv)
* Thu Jun 04 2020 Nicolas Chauvet <kwizart@gmail.com> - 2.9.0-4
- Rebuilt for OpenCV 4.3

20
gmic_opencv.patch
View File

@ -1,20 +0,0 @@
--- 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)