This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 45038984c721c446e6338119d23c7ff461e940ea
Author: Gilles Filippini <p...@debian.org>
Date: Wed Oct 18 01:10:25 2017 +0200
New patch opencv-3.patch to build against opencv 3.2
This is the same as opencv-3.1.patch previously removed.
---
debian/changelog | 8 ++
debian/control | 2 +-
debian/patches/opencv-3.patch | 168 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 178 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ca30d26..81af9d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sikulix (1.1.1-3) unstable; urgency=medium
+
+ * Build against OpenCV 3.2 (closes: #877073)
+ * New patch opencv-3.patch
+ * libsikulix-api-java: Depends: libopencv3.2-java
+
+ -- Gilles Filippini <p...@debian.org> Wed, 18 Oct 2017 01:08:25 +0200
+
sikulix (1.1.1-2) unstable; urgency=medium
* Build-Depends: replace libasm3-java with libasm-java to support
diff --git a/debian/control b/debian/control
index f139fd1..df81313 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Replaces: libsikuli-script-java (<< 1.1.0~)
Breaks: libsikuli-script-java (<< 1.1.0~)
Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) |
java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<<
${source:Version}+), jython (>= 2.7.1), wmctrl, xdotool, tesseract-ocr-eng
# These ones miss maven integration
- , libcommons-exec-java, libopencv2.4-java
+ , libcommons-exec-java, libopencv3.2-java
# The script sikuli2html.py needs python
, python
# RunTime.java needs commands lsb-release and killall
diff --git a/debian/patches/opencv-3.patch b/debian/patches/opencv-3.patch
new file mode 100644
index 0000000..5cd34c9
--- /dev/null
+++ b/debian/patches/opencv-3.patch
@@ -0,0 +1,168 @@
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp
+===================================================================
+--- sikuli.orig/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp
+@@ -389,7 +389,7 @@ void denoise(Mat& src){
+ void
+ cvgui::linkLineBlobsIntoPagagraphBlobs(vector<LineBlob>& blobs,
vector<ParagraphBlob>& parablobs){
+
+- sort(blobs, sort_blob_by_y);
++ std::sort(blobs.begin(), blobs.end(), sort_blob_by_y);
+
+ for (vector<LineBlob>::iterator it = blobs.begin();
+ it != blobs.end(); ++it){
+@@ -424,7 +424,7 @@ cvgui::linkLineBlobsIntoPagagraphBlobs(v
+ void
+ cvgui::mergeLineBlobs(vector<LineBlob>& blobs, vector<LineBlob>&
merged_blobs){
+
+- sort(blobs, sort_blob_by_x);
++ std::sort(blobs.begin(), blobs.end(), sort_blob_by_x);
+
+ for (vector<LineBlob>::iterator it = blobs.begin();
+ it != blobs.end(); ++it){
+@@ -459,7 +459,7 @@ cvgui::mergeLineBlobs(vector<LineBlob>&
+ void
+ cvgui::linkBlobsIntoLineBlobs(vector<Blob>& blobs, vector<LineBlob>& lines,
int max_spacing){
+
+- sort(blobs, sort_blob_by_x);
++ std::sort(blobs.begin(), blobs.end(), sort_blob_by_x);
+ for (vector<Blob>::iterator it = blobs.begin();
+ it != blobs.end(); ++it){
+
+@@ -1780,7 +1780,7 @@ cvgui::areHorizontallyAligned(const vect
+ return true;
+
+ vector<Rect> sorted_rects = rects;
+- sort(sorted_rects, sort_by_x);
++ std::sort(sorted_rects.begin(), sorted_rects.end(), sort_by_x);
+
+ int ymin = 10000;
+ int ymax = 0;
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp
+===================================================================
+--- sikuli.orig/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp
+@@ -30,7 +30,7 @@ BaseFinder::BaseFinder(const char* sourc
+ }
+
+ // somwhow after changing it to false works!!
+-BaseFinder::BaseFinder(IplImage* _source) : source(Mat(_source, false)){
++BaseFinder::BaseFinder(const IplImage* _source) : source(cvarrToMat(_source,
false)){
+ roi = Rect(0,0,source.cols,source.rows);
+ }
+
+@@ -90,7 +90,7 @@ TemplateFinder::find(const char *target_
+
+ void
+ TemplateFinder::find(IplImage* target, double min_similarity){
+- find(Mat(target, false), min_similarity);
++ find(cvarrToMat(target, false), min_similarity);
+ }
+
+ void
+@@ -104,7 +104,7 @@ TemplateFinder::find_all(const char *tar
+
+ void
+ TemplateFinder::find_all(IplImage* target, double min_similarity){
+- find_all(Mat(target, true), min_similarity);
++ find_all(cvarrToMat(target, true), min_similarity);
+ }
+
+ void
+@@ -165,7 +165,7 @@ TemplateFinder::add_matches_to_buffer(in
+ FindResult next_match = matcher->next();
+ buffered_matches.push_back(next_match);
+ }
+- sort(buffered_matches,sort_by_score);
++ std::sort(buffered_matches.begin(), buffered_matches.end(), sort_by_score);
+ }
+
+ void
+@@ -233,7 +233,7 @@ TemplateFinder::next(){
+
+ FindResult next_match = matcher->next();
+ buffered_matches[0] = next_match;
+- sort(buffered_matches,sort_by_score);
++ std::sort(buffered_matches.begin(), buffered_matches.end(), sort_by_score);
+ return top_match;
+ }
+
+@@ -336,7 +336,7 @@ ChangeFinder::find(const char* new_scree
+
+ void
+ ChangeFinder::find(IplImage* new_screen_image){
+- find(Mat(new_screen_image, false));
++ find(cvarrToMat(new_screen_image, false));
+ }
+
+ #include "opencv2/imgproc/imgproc_c.h"
+@@ -547,7 +547,7 @@ Finder::Finder(Mat source)
+ }
+
+ Finder::Finder(IplImage* source)
+-: _source(Mat(source)){
++: _source(cvarrToMat(source)){
+ _finder = NULL;
+ _roi = Rect(-1,-1,-1,-1);
+ }
+@@ -569,7 +569,7 @@ Finder::find(IplImage* target, double mi
+
+ if (abs(min_similarity - 100)< 0.00001){
+ dout << "training.." << endl;
+- Mat im(target);
++ Mat im = cvarrToMat(target);
+ TextFinder::train(im);
+
+ }else{
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/finder.h
+===================================================================
+--- sikuli.orig/Libslux/src/main/resources/srcnativelibs/Vision/finder.h
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/finder.h
+@@ -19,7 +19,7 @@ class BaseFinder{
+
+ public:
+
+- BaseFinder(IplImage* screen_image);
++ BaseFinder(const IplImage* screen_image);
+ BaseFinder(Mat source);
+ BaseFinder(const char* source_image_filename);
+ virtual ~BaseFinder();
+Index:
sikuli/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp
+===================================================================
+---
sikuli.orig/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp
++++
sikuli/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp
+@@ -4,6 +4,8 @@
+ *
+ */
+
++#include <map>
++
+ #include "pyramid-template-matcher.h"
+ #include "vision.h"
+
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp
+===================================================================
+--- sikuli.orig/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp
+@@ -5,6 +5,8 @@
+ * modified RaiMan 2013
+ */
+
++#include <map>
++
+ #include "vision.h"
+ #include "finder.h"
+ #include "tessocr.h"
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/vision.h
+===================================================================
+--- sikuli.orig/Libslux/src/main/resources/srcnativelibs/Vision/vision.h
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/vision.h
+@@ -8,6 +8,8 @@
+ #ifndef _VISION_H_
+ #define _VISION_H_
+
++#include <map>
++
+ #include "find-result.h"
+ #include "opencv.hpp"
+ #include "tessocr.h"
diff --git a/debian/patches/series b/debian/patches/series
index 8e16f69..a54b671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,7 @@ dependency-opencv.patch
fix-log-parameters-order.patch
jython-sikulix-module-path.patch
debian-java-parameters.patch
+opencv-3.patch
no-jadb.patch
no-vnc.patch
jxgrabkey-not-embedded.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/sikuli.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
