commit 1c08bb6e50445f70131df4359fcc824d5f853c4e
Author: Jan Rękorajski <[email protected]>
Date: Mon Apr 30 00:24:06 2018 +0200
- one more c vs c++ fix
- rel 3
cplusplus.patch | 14 ++++++++++++++
opencv.spec | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/opencv.spec b/opencv.spec
index bf2e474..60a8529 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -60,7 +60,7 @@ Summary: A library of programming functions mainly aimed
at real time computer v
Summary(pl.UTF-8): Biblioteka funkcji do grafiki komputerowej w czasie
rzeczywistym
Name: opencv
Version: 3.4.1
-Release: 2
+Release: 3
Epoch: 1
%if %{with unicap} || %{with xine}
License: GPL (enforced by used libraries), BSD (opencv itself)
diff --git a/cplusplus.patch b/cplusplus.patch
index eb57b95..ccac14e 100644
--- a/cplusplus.patch
+++ b/cplusplus.patch
@@ -26,3 +26,17 @@
#endif
#endif
+--- opencv-3.4.1/modules/highgui/include/opencv2/highgui/highgui_c.h~
2018-02-23 09:38:33.000000000 +0100
++++ opencv-3.4.1/modules/highgui/include/opencv2/highgui/highgui_c.h
2018-04-30 00:00:01.659113349 +0200
+@@ -136,7 +136,11 @@
+ CVAPI(double) cvGetWindowProperty(const char* name, int prop_id);
+
+ /* Get window image rectangle coordinates, width and height */
++#ifdef __cplusplus
+ CVAPI(cv::Rect)cvGetWindowImageRect(const char* name);
++#else
++CVAPI(CvRect)cvGetWindowImageRect(const char* name);
++#endif
+
+ /* display image within window (highgui windows remember their content) */
+ CVAPI(void) cvShowImage( const char* name, const CvArr* image );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/1c08bb6e50445f70131df4359fcc824d5f853c4e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
