Revert "fix gmic_opencv.patch"

This reverts commit de58e8142f.
Revert "bump version"
2020-03-30 21:42:22 +02:00 · 2020-03-30 21:39:19 +02:00 · 2020-03-30 21:38:19 +02:00
3 changed files with 12 additions and 16 deletions
--- a/gmic.spec
+++ b/gmic.spec
@ -3,13 +3,13 @@
 %global use_system_cimg 1

 # As generated by new-snapshot.sh script
-%global zart_version 20200330git7470fdd
-%global gmic_qt_version 20200330gitc04c336
-%global gmic_community_version 20200330git087f484
+%global zart_version 20200213git099554f
+%global gmic_qt_version 20200213git168e4cc
+%global gmic_community_version 20200213git871e999

 Summary: GREYC's Magic for Image Computing
 Name:    gmic
-Version: 2.9.0
+Version: 2.8.4
 Release: 1%{?dist}
 Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz
 # GIT archive snapshot of https://github.com/c-koi/zart
@ -159,10 +159,6 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic
 %{gimpplugindir}/gmic_cluts.gmz

 %changelog
-* Mon Mar 30 2020 josef radinger <cheese@nosuchhost.net> - 2.9.0-1
- bump version
- update gmic_opencv.patch
-
 * Thu Feb 13 2020 josef radinger <cheese@nosuchhost.net> - 2.8.4-1
 - bump version

--- a/gmic_opencv.patch
+++ b/gmic_opencv.patch
@ -1,15 +1,15 @@
--- 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
+--- gmic-2.7.4/zart/src/ImageConverter.cpp.orig	2019-10-15 22:17:36.043062873 +0200
+++ gmic-2.7.4/zart/src/ImageConverter.cpp	2019-10-15 22:19:36.252242400 +0200
@@ -70,7 +70,7 @@
 
-   cv::Mat tmp(in->cols, in->rows, in->type());
+   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());
-@@ -113,7 +113,7 @@
+@@ -106,7 +106,7 @@
       dst += step;
     }
   }
--- a/8
+++ b/8
@ -1,4 +1,4 @@
-SHA512 (gmic-community-20200330git087f484.tar.gz) = 3a7f4d2cd9833cad7565a47de04378cba88e0ff66cd19996637b4a29f96ed85576d2a4a8c673443847e14033b2498609481684cc78997169798cc4163b77e69b
-SHA512 (gmic-qt-20200330gitc04c336.tar.gz) = de9671260afe31f15e11cfc6b499d43ef6e9dee3eb7f3957cb382b4acf069a48bf28f1a884fa61050023e6db162b4046ae5d9192a60ee0171902e22bb59ae37f
-SHA512 (zart-20200330git7470fdd.tar.gz) = eaa9f68b9137e901824a0afc7abaf343c9a10bd06b1514a00773f1f53e8ce29df7f3253e95be481ad1b5c48cf49e50bf81284152350435a7465a0b0d3850b9a6
-SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
+SHA512 (gmic-community-20200213git871e999.tar.gz) = 093873e8cb6bcaf3a0d1cf96bed9d08b5f4b826f9a0530029e9a8438bbe81329cff7d0cd38341f17891862cccf05ab537e94364d9d8a8806563711103f8a8aab
+SHA512 (gmic-qt-20200213git168e4cc.tar.gz) = 23943fe573cf9ce337725b14204cc930adba17daec01829ace655ee5ae91b9144fde93074f8930f84083ee803ea070dd946a58de44b24d225ffa64da89d45837
+SHA512 (zart-20200213git099554f.tar.gz) = 7932cbb5582f22bb638302ebbbff033ed3b8339de641b3d85579246d559e264a8d3f21c0139691dde8d7c9162545803ea1e5188b04e16d41d45fc8c6bceff357
+SHA512 (gmic_2.8.4.tar.gz) = 7e6de83493c6fd970c3752f8638e4562fcd5233bebd926a8e439fbe04742604c27555f47aa4751ab869dbf0c759bc4abc3bc6c1d095bfe1faf00fe769e5c3a6d
Author	SHA1	Message	Date
josef radinger	5a46370009	Revert "fix gmic_opencv.patch" This reverts commit `de58e8142f`.	2020-03-30 21:42:22 +02:00
josef radinger	fff077df92	Revert "bump version" This reverts commit `a8f9e2d08f`.	2020-03-30 21:39:19 +02:00
josef radinger	f8cbc7fd8e	Revert "fix gmic_opencv.patch" This reverts commit `614d1cc2a2`.	2020-03-30 21:38:19 +02:00