[saga] 02/11: Fix opencv module

[Johan Van de Wauw]

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch patch-queue/master
in repository saga.

commit 543dd7d063e3cf191439180c2b17363c51a01ea0
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Jul 7 23:46:12 2015 +0200

    Fix opencv module
---
 debian/patches/0007-Fix-opencv-module.patch | 81 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 82 insertions(+)

diff --git a/debian/patches/0007-Fix-opencv-module.patch b/debian/patches/0007-Fix-opencv-module.patch
new file mode 100644
index 0000000..45bd197
--- /dev/null
+++ b/debian/patches/0007-Fix-opencv-module.patch
@@ -0,0 +1,81 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Tue, 7 Jul 2015 23:45:58 +0200
+Subject: Fix opencv module
+
+---
+ configure.ac                                       | 2 +-
+ src/modules/imagery/imagery_opencv/Makefile.am     | 2 +-
+ src/modules/imagery/imagery_opencv/opencv.h        | 2 ++
+ src/modules/imagery/imagery_opencv/opencv_nnet.cpp | 4 ++--
+ src/modules/imagery/imagery_opencv/opencv_nnet.h   | 4 ++--
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 64c88ad..45db13f 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB([cv], [cvGetRows], CVFOUND=1,,)
++AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
+ AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
+ AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
+ AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
+diff --git a/src/modules/imagery/imagery_opencv/Makefile.am b/src/modules/imagery/imagery_opencv/Makefile.am
+index e3210ee..f6115d2 100644
+--- a/src/modules/imagery/imagery_opencv/Makefile.am
++++ b/src/modules/imagery/imagery_opencv/Makefile.am
+@@ -11,7 +11,7 @@ if HAVE_CV
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS         = -fPIC -shared -avoid-version -lcv
++AM_LDFLAGS         = -fPIC -shared -avoid-version -lopencv_core -lopencv_imgproc
+ pkglib_LTLIBRARIES = libimagery_opencv.la
+ libimagery_opencv_la_SOURCES =\
+ MLB_Interface.cpp\
+diff --git a/src/modules/imagery/imagery_opencv/opencv.h b/src/modules/imagery/imagery_opencv/opencv.h
+index 99399cd..d6c4dad 100644
+--- a/src/modules/imagery/imagery_opencv/opencv.h
++++ b/src/modules/imagery/imagery_opencv/opencv.h
+@@ -75,6 +75,8 @@
+ //---------------------------------------------------------
+ #include <opencv/cv.h>
+ 
++#include <opencv2/core/core_c.h>
++#include <opencv2/imgproc/imgproc_c.h>
+ 
+ ///////////////////////////////////////////////////////////
+ //														 //
+diff --git a/src/modules/imagery/imagery_opencv/opencv_nnet.cpp b/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
+index f123d16..6bbe376 100644
+--- a/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
++++ b/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
+@@ -60,8 +60,8 @@
+ 
+ //---------------------------------------------------------
+ #include "opencv_nnet.h"
+-#include "opencv\cxcore.h"
+-#include "opencv\ml.h"
++#include "opencv/cxcore.h"
++#include "opencv/ml.h"
+ 
+ ///////////////////////////////////////////////////////////
+ //														 //
+diff --git a/src/modules/imagery/imagery_opencv/opencv_nnet.h b/src/modules/imagery/imagery_opencv/opencv_nnet.h
+index ed22567..e1e1f1d 100644
+--- a/src/modules/imagery/imagery_opencv/opencv_nnet.h
++++ b/src/modules/imagery/imagery_opencv/opencv_nnet.h
+@@ -64,8 +64,8 @@
+ 
+ //---------------------------------------------------------
+ #include "MLB_Interface.h"
+-#include "opencv\cxcore.h"
+-#include "opencv\ml.h"
++#include "opencv/cxcore.h"
++#include "opencv/ml.h"
+ 
+ ///////////////////////////////////////////////////////////
+ //														 //
diff --git a/debian/patches/series b/debian/patches/series
index 75a96ba..cebe656 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Use-debian-version-of-libsvm.patch
 0005-0099-no-hdf5.patch
 0006-Fix-vigra-path.patch
+0007-Fix-opencv-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git