[saga] 04/11: update

[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 567f2939dcf7a379ea0684709508b6976237d205
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Jul 9 17:53:08 2015 +0200

    update
---
 debian/patches/0007-Fix-opencv-module.patch | 53 ++++++++++-------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/debian/patches/0007-Fix-opencv-module.patch b/debian/patches/0007-Fix-opencv-module.patch
index 1e9bd84..b631928 100644
--- a/debian/patches/0007-Fix-opencv-module.patch
+++ b/debian/patches/0007-Fix-opencv-module.patch
@@ -1,15 +1,14 @@
 From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Wed, 8 Jul 2015 20:24:25 +0200
+Date: Thu, 9 Jul 2015 17:52:55 +0200
 Subject: Fix opencv module
 
 ---
- configure.ac                                         | 2 +-
- src/modules/imagery/imagery_opencv/MLB_Interface.cpp | 2 --
- src/modules/imagery/imagery_opencv/Makefile.am       | 2 +-
- src/modules/imagery/imagery_opencv/opencv.h          | 4 +++-
- src/modules/imagery/imagery_opencv/opencv_nnet.cpp   | 4 ++--
- src/modules/imagery/imagery_opencv/opencv_nnet.h     | 4 ++--
- 6 files changed, 9 insertions(+), 9 deletions(-)
+ 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
@@ -24,21 +23,8 @@ index 64c88ad..45db13f 100755
  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/MLB_Interface.cpp b/src/modules/imagery/imagery_opencv/MLB_Interface.cpp
-index 209e212..d2198a1 100644
---- a/src/modules/imagery/imagery_opencv/MLB_Interface.cpp
-+++ b/src/modules/imagery/imagery_opencv/MLB_Interface.cpp
-@@ -63,8 +63,6 @@
- 
- #include "MLB_Interface.h"
- 
--#include <opencv/cv.h>
--
- //---------------------------------------------------------
- // 2. Place general module library informations here...
- 
 diff --git a/src/modules/imagery/imagery_opencv/Makefile.am b/src/modules/imagery/imagery_opencv/Makefile.am
-index e3210ee..f6115d2 100644
+index e3210ee..24f97c4 100644
 --- a/src/modules/imagery/imagery_opencv/Makefile.am
 +++ b/src/modules/imagery/imagery_opencv/Makefile.am
 @@ -11,7 +11,7 @@ if HAVE_CV
@@ -46,20 +32,17 @@ index e3210ee..f6115d2 100644
  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
++AM_LDFLAGS         = -fPIC -shared -avoid-version -lopencv_core -lopencv_imgproc-lopencv_flann
  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..6f79b8b 100644
+index 99399cd..d6c4dad 100644
 --- a/src/modules/imagery/imagery_opencv/opencv.h
 +++ b/src/modules/imagery/imagery_opencv/opencv.h
-@@ -73,8 +73,10 @@
- #include "MLB_Interface.h"
- 
+@@ -75,6 +75,8 @@
  //---------------------------------------------------------
--#include <opencv/cv.h>
-+#include <opencv2/cv.h>
+ #include <opencv/cv.h>
  
 +#include <opencv2/core/core_c.h>
 +#include <opencv2/imgproc/imgproc_c.h>
@@ -67,7 +50,7 @@ index 99399cd..6f79b8b 100644
  ///////////////////////////////////////////////////////////
  //														 //
 diff --git a/src/modules/imagery/imagery_opencv/opencv_nnet.cpp b/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
-index f123d16..905695e 100644
+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 @@
@@ -76,13 +59,13 @@ index f123d16..905695e 100644
  #include "opencv_nnet.h"
 -#include "opencv\cxcore.h"
 -#include "opencv\ml.h"
-+#include "opencv2/cxcore.h"
-+#include "opencv2/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..9e4816c 100644
+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 @@
@@ -91,8 +74,8 @@ index ed22567..9e4816c 100644
  #include "MLB_Interface.h"
 -#include "opencv\cxcore.h"
 -#include "opencv\ml.h"
-+#include "opencv2/cxcore.h"
-+#include "opencv2/ml.h"
++#include "opencv/cxcore.h"
++#include "opencv/ml.h"
  
  ///////////////////////////////////////////////////////////
  //														 //

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