[sikuli] 01/01: Upload release 1.1.0-1 to unstable
Gilles Filippini
pini at debian.org
Fri Nov 18 17:57:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 41500fef8114d1d600ede644e6f4d547fd3c878f
Author: Gilles Filippini <pini at debian.org>
Date: Thu Nov 17 21:46:43 2016 +0100
Upload release 1.1.0-1 to unstable
+ opencv-3.1.patch to cope with opencv-3.1 transition.
---
debian/changelog | 7 ++
debian/patches/opencv-3.1.patch | 168 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 176 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 750433a..480c773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sikulix (1.1.0-1) unstable; urgency=medium
+
+ * New patch opencv-3.1.patch to cope with opencv-3.1 transition
+ * Upload to unstable (closes: #832634)
+
+ -- Gilles Filippini <pini at debian.org> Thu, 17 Nov 2016 21:12:17 +0100
+
sikulix (1.1.0-1~exp3) experimental; urgency=medium
* debian/control: drop versioned Build-Depends on default-jdk (<< 2:1.8~)
diff --git a/debian/patches/opencv-3.1.patch b/debian/patches/opencv-3.1.patch
new file mode 100644
index 0000000..0f33b9c
--- /dev/null
+++ b/debian/patches/opencv-3.1.patch
@@ -0,0 +1,168 @@
+Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp
+===================================================================
+--- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp
++++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp
+@@ -396,7 +396,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){
+@@ -431,7 +431,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){
+@@ -467,7 +467,7 @@ 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){
+
+@@ -1884,7 +1884,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: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp
+===================================================================
+--- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp
++++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp
+@@ -33,7 +33,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);
+ }
+
+@@ -93,7 +93,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
+@@ -108,7 +108,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
+@@ -170,7 +170,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
+@@ -238,7 +238,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;
+ }
+
+@@ -343,7 +343,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"
+@@ -563,7 +563,7 @@ Finder::Finder(Mat source)
+ }
+
+ Finder::Finder(IplImage* source)
+-: _source(Mat(source)){
++: _source(cvarrToMat(source)){
+ _finder = NULL;
+ _roi = Rect(-1,-1,-1,-1);
+ }
+@@ -586,7 +586,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: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.h
+===================================================================
+--- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/finder.h
++++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.h
+@@ -20,7 +20,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: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp
+===================================================================
+--- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp
++++ sikulix-1.1.0/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: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp
+===================================================================
+--- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp
++++ sikulix-1.1.0/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: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/vision.h
+===================================================================
+--- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/vision.h
++++ sikulix-1.1.0/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 0e70665..7ba934a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ python-shebang.patch
dependency-opencv.patch
no-vnc-package.patch
fix-log-parameters-order.patch
+opencv-3.1.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list