[sikuli] 01/01: Release 1.0~x~rc3.tesseract3-dfsg1-13
Gilles Filippini
pini at debian.org
Sun Nov 6 10:53:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch 1.0_x_rc3
in repository sikuli.
commit 1f51ee130ce5f20f4c6fa2bdcfe92558ca2b5b16
Author: Gilles Filippini <pini at debian.org>
Date: Sun Nov 6 02:52:10 2016 +0100
Release 1.0~x~rc3.tesseract3-dfsg1-13
New patch opencv-3.1.patch to cope with opencv-3.1 transition.
---
debian/changelog | 6 ++
debian/patches/opencv-3.1.patch | 169 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 176 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1f23611..1fd3953 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-13) unstable; urgency=medium
+
+ * New patch to cope with opencv-3.1 transiton (closes: #841409)
+
+ -- Gilles Filippini <pini at debian.org> Sun, 06 Nov 2016 02:51:25 +0100
+
sikuli (1.0~x~rc3.tesseract3-dfsg1-12) unstable; urgency=medium
* Fix erroneous line count in patch executable-wrappers.patch
diff --git a/debian/patches/opencv-3.1.patch b/debian/patches/opencv-3.1.patch
new file mode 100644
index 0000000..08131e3
--- /dev/null
+++ b/debian/patches/opencv-3.1.patch
@@ -0,0 +1,169 @@
+Index: sikuli/sikuli-script/src/main/native/cvgui.cpp
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/native/cvgui.cpp
++++ sikuli/sikuli-script/src/main/native/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){
+
+@@ -1565,7 +1565,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/sikuli-script/src/main/native/vdict.cpp
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/native/vdict.cpp
++++ sikuli/sikuli-script/src/main/native/vdict.cpp
+@@ -53,8 +53,7 @@ namespace VDict{
+
+ }
+
+-
+- void doPyrDown(IplImage** pin, int filter = IPL_GAUSSIAN_5x5)
++ void doPyrDown(IplImage** pin, int filter = CV_GAUSSIAN_5x5)
+ {
+ // Best to make sure input image is divisible by two.
+ //
+Index: sikuli/sikuli-script/src/main/native/finder.h
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/native/finder.h
++++ sikuli/sikuli-script/src/main/native/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: sikuli/sikuli-script/src/main/native/finder.cpp
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/native/finder.cpp
++++ sikuli/sikuli-script/src/main/native/finder.cpp
+@@ -34,7 +34,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);
+ }
+
+@@ -94,7 +94,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
+@@ -109,7 +109,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
+@@ -171,7 +171,7 @@ TemplateFinder::add_matches_to_buffer(in
+ FindResult next_match = matcher->next();
+ buffered_matches.push_back(next_match);
+ }
+- sort(buffered_matches,sort_by_score);
++ sort(buffered_matches.begin(), buffered_matches.end(),sort_by_score);
+ }
+
+ void
+@@ -242,7 +242,7 @@ TemplateFinder::next(){
+
+ FindResult next_match = matcher->next();
+ buffered_matches[0] = next_match;
+- sort(buffered_matches,sort_by_score);
++ sort(buffered_matches.begin(),buffered_matches.end(),sort_by_score);
+ return top_match;
+ }
+
+@@ -347,7 +347,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));
+ }
+
+ void
+@@ -568,7 +568,7 @@ Finder::Finder(Mat source)
+ }
+
+ Finder::Finder(IplImage* source)
+-: _source(Mat(source)){
++: _source(cvarrToMat(source)){
+ _finder = NULL;
+ _roi = Rect(-1,-1,-1,-1);
+ }
+@@ -591,7 +591,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/sikuli-script/src/main/native/vision.h
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/native/vision.h
++++ sikuli/sikuli-script/src/main/native/vision.h
+@@ -12,6 +12,8 @@
+ #include "tessocr.h"
+ #include "cvgui.h"
+
++#include <map>
++
+ using namespace cv;
+
+ namespace sikuli {
+Index: sikuli/sikuli-script/src/main/native/cvgui.h
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/native/cvgui.h
++++ sikuli/sikuli-script/src/main/native/cvgui.h
+@@ -6,7 +6,7 @@
+ #ifndef _CVGUI_H_
+ #define _CVGUI_H_
+
+-#include "opencv.hpp"
++#include <cv.hpp>
+ #include <iostream>
+ #include "tessocr.h"
+
diff --git a/debian/patches/series b/debian/patches/series
index 1fe1ded..821620c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ no-opencv-surf-module.patch
setTextAndMnemonic.patch
no-adsense.patch
target-java-6.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