ropencv 0.0.17 → 0.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/helper.rb +17 -4
- data/ext/opencv.txt +22 -1
- data/ext/post_opencv244.txt +4 -0
- data/ext/post_opencv249.txt +7 -0
- data/ext/rbind.rb +1 -0
- data/lib/ropencv/ropencv_ruby.rb +48 -5
- data/ropencv.gemspec +3 -3
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a21fadec0688391caa58a3f1f6d0d6cab7a3d3e5
|
4
|
+
data.tar.gz: db8f28e144e303f017162b156cdf78259928180f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cdc23ed5fa3c1e6e27eeaf4b58bd2f2f4ea3e132ec61c1ffb321882c7c75d8054f7ca0880f219639a50bfd8c4154e3cc8950c1923f4c42b0ac8f331f97569fec
|
7
|
+
data.tar.gz: ae92ab5a3c0c8547755227904f2b11b99b8db366aa46c2ea06a2b6bc3f44bd7ca6e8878195216a83d4d7a4ca351a49238f96d06cb7fbe3c5c338b91850b5b9ab
|
data/ext/helper.rb
CHANGED
@@ -106,7 +106,7 @@ def find_opencv
|
|
106
106
|
"opencv2/highgui/highgui_c.h", "opencv2/highgui/highgui.hpp",
|
107
107
|
"opencv2/contrib/contrib.hpp", "opencv2/nonfree/nonfree.hpp",
|
108
108
|
"opencv2/nonfree/features2d.hpp"]
|
109
|
-
elsif opencv_version >= "2.4.9"
|
109
|
+
elsif opencv_version >= "2.4.9" && opencv_version < "3.0.0"
|
110
110
|
["opencv2/core.hpp", "opencv2/core/types.hpp","opencv2/core/persistence.hpp",
|
111
111
|
"opencv2/core/utility.hpp", "opencv2/core/base.hpp","opencv2/core/core.hpp",
|
112
112
|
"opencv2/contrib.hpp", "opencv2/calib3d.hpp",
|
@@ -119,9 +119,22 @@ def find_opencv
|
|
119
119
|
"opencv2/video.hpp", "opencv2/legacy.hpp","opencv2/video/tracking.hpp",
|
120
120
|
"opencv2/video/background_segm.hpp",
|
121
121
|
"opencv2/videostab.hpp"]
|
122
|
-
|
123
|
-
|
124
|
-
|
122
|
+
elsif opencv_version >= "3.0.0"
|
123
|
+
["opencv2/core.hpp", "opencv2/core/types.hpp","opencv2/core/persistence.hpp",
|
124
|
+
"opencv2/core/utility.hpp", "opencv2/core/base.hpp","opencv2/core/core.hpp",
|
125
|
+
"opencv2/contrib/contrib.hpp", "opencv2/calib3d.hpp",
|
126
|
+
"opencv2/features2d.hpp", "opencv2/flann.hpp",
|
127
|
+
"opencv2/highgui.hpp", "opencv2/imgproc.hpp",
|
128
|
+
"opencv2/ml.hpp", "opencv2/nonfree.hpp",
|
129
|
+
"opencv2/nonfree/features2d.hpp", "opencv2/objdetect.hpp",
|
130
|
+
"opencv2/photo.hpp", "opencv2/softcascade/softcascade.hpp",
|
131
|
+
"opencv2/stitching.hpp", "opencv2/superres.hpp",
|
132
|
+
"opencv2/video.hpp", "opencv2/legacy/legacy.hpp","opencv2/video/tracking.hpp",
|
133
|
+
"opencv2/video/background_segm.hpp",
|
134
|
+
"opencv2/videostab.hpp"]
|
135
|
+
else
|
136
|
+
raise "OpenCV version #{opencv_version} is not supported"
|
137
|
+
end
|
125
138
|
|
126
139
|
temp = paths.clone
|
127
140
|
temp.each do |path|
|
data/ext/opencv.txt
CHANGED
@@ -55,7 +55,7 @@ cv.Range.Range
|
|
55
55
|
int end
|
56
56
|
cv.Range.size int
|
57
57
|
cv.Range.size bool
|
58
|
-
cv.Range.all Range
|
58
|
+
cv.Range.all Range /S
|
59
59
|
cv.Range.all Range
|
60
60
|
cv.Range.operator== bool
|
61
61
|
Range r
|
@@ -328,6 +328,27 @@ cv.Mat.Mat
|
|
328
328
|
int type
|
329
329
|
void* data
|
330
330
|
size_t step AUTO_STEP
|
331
|
+
cv.Mat.Mat
|
332
|
+
Size size
|
333
|
+
int type
|
334
|
+
void* data
|
335
|
+
size_t step AUTO_STEP
|
336
|
+
cv.Mat.Mat
|
337
|
+
int rows
|
338
|
+
int cols
|
339
|
+
int type
|
340
|
+
Scalar scalar
|
341
|
+
cv.Mat.Mat
|
342
|
+
Size size
|
343
|
+
int type
|
344
|
+
Scalar scalar
|
345
|
+
cv.Mat.Mat
|
346
|
+
Mat m
|
347
|
+
Range row_range
|
348
|
+
Range col_range Range::all()
|
349
|
+
cv.Mat.Mat
|
350
|
+
Mat m
|
351
|
+
Rect roi
|
331
352
|
cv.Mat.operator+ Mat
|
332
353
|
Mat mat
|
333
354
|
cv.Mat.operator+ Mat
|
data/ext/post_opencv244.txt
CHANGED
data/ext/post_opencv249.txt
CHANGED
@@ -8,4 +8,11 @@ cv.KeyPoint.convert void /S
|
|
8
8
|
float response
|
9
9
|
int octave 0
|
10
10
|
int class_id -1
|
11
|
+
cv.DescriptorMatcher.radiusMatch void
|
12
|
+
cv::Mat queryDescriptors
|
13
|
+
cv::Mat trainDescriptors
|
14
|
+
vector_vector_DMatch matches /O
|
15
|
+
float maxDistance
|
16
|
+
cv::Mat mask cv::Mat()
|
17
|
+
bool compactResult false
|
11
18
|
|
data/ext/rbind.rb
CHANGED
@@ -78,6 +78,7 @@ rbind.parser.type("std::vector<uint32_t>")
|
|
78
78
|
rbind.parser.type("std::vector<uint64_t>")
|
79
79
|
rbind.parser.type("std::vector<int8_t>")
|
80
80
|
rbind.parser.type("std::vector<int64_t>")
|
81
|
+
rbind.parser.type("std::vector<Scalar>")
|
81
82
|
rbind.parser.type("std::vector<std::vector<Point2d> >")
|
82
83
|
|
83
84
|
# add some extra documentation
|
data/lib/ropencv/ropencv_ruby.rb
CHANGED
@@ -620,11 +620,11 @@ module OpenCV
|
|
620
620
|
# returns a string compatible to matlab's MAT-file
|
621
621
|
def to_MAT(variable_name)
|
622
622
|
<<eos
|
623
|
-
|
624
|
-
|
625
|
-
|
626
|
-
|
627
|
-
|
623
|
+
% Created by ropencv, #{Time.now}
|
624
|
+
% name: #{variable_name}
|
625
|
+
% type: matrix
|
626
|
+
% rows: #{rows}
|
627
|
+
% columns: #{cols}
|
628
628
|
#{to_a.map{|row|row.join(" ")}.join("\n")}
|
629
629
|
eos
|
630
630
|
end
|
@@ -653,6 +653,49 @@ eos
|
|
653
653
|
end
|
654
654
|
result
|
655
655
|
end
|
656
|
+
|
657
|
+
def ==(val)
|
658
|
+
compare(val,Cv::CMP_EQ)
|
659
|
+
end
|
660
|
+
|
661
|
+
def >(val)
|
662
|
+
compare(val,Cv::CMP_GT)
|
663
|
+
end
|
664
|
+
|
665
|
+
def >=(val)
|
666
|
+
compare(val,Cv::CMP_GE)
|
667
|
+
end
|
668
|
+
|
669
|
+
def <(val)
|
670
|
+
compare(val,Cv::CMP_LT)
|
671
|
+
end
|
672
|
+
|
673
|
+
def <=(val)
|
674
|
+
compare(val,Cv::CMP_LE)
|
675
|
+
end
|
676
|
+
|
677
|
+
def !=(val)
|
678
|
+
compare(val,Cv::CMP_NE)
|
679
|
+
end
|
680
|
+
|
681
|
+
def ===(val)
|
682
|
+
val = compare(val,Cv::CMP_EQ)
|
683
|
+
count = cv::countNonZero(val)
|
684
|
+
count == val.rows*val.cols
|
685
|
+
end
|
686
|
+
|
687
|
+
def compare(val,type)
|
688
|
+
val = if val.is_a?(Cv::Mat)
|
689
|
+
val
|
690
|
+
elsif val.respond_to?(:to_a)
|
691
|
+
val.to_a
|
692
|
+
else
|
693
|
+
[val]
|
694
|
+
end
|
695
|
+
dst = Cv::Mat.new
|
696
|
+
Cv::compare(self,val,dst,type)
|
697
|
+
dst
|
698
|
+
end
|
656
699
|
end
|
657
700
|
end
|
658
701
|
end
|
data/ropencv.gemspec
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = 'ropencv'
|
3
|
-
s.version = '0.0.
|
4
|
-
s.date = '2014-
|
3
|
+
s.version = '0.0.18'
|
4
|
+
s.date = '2014-10-11'
|
5
5
|
s.platform = Gem::Platform::RUBY
|
6
6
|
s.authors = ['Alexander Duda']
|
7
7
|
s.email = ['Alexander.Duda@dfki.de']
|
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
|
|
11
11
|
s.files = `git ls-files`.split("\n") + ["lib/ropencv/ropencv_types.rb","lib/ropencv/ropencv_ruby.rb"]
|
12
12
|
s.require_path = 'lib'
|
13
13
|
s.required_rubygems_version = ">= 1.3.6"
|
14
|
-
s.add_runtime_dependency "rbind", ">= 0.0.
|
14
|
+
s.add_runtime_dependency "rbind", ">= 0.0.26"
|
15
15
|
s.add_runtime_dependency "ffi", "~> 1.9.0"
|
16
16
|
s.extensions = ['ext/extconf.rb']
|
17
17
|
s.license = 'BSD'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ropencv
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.18
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Alexander Duda
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-10-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rbind
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '>='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.0.
|
19
|
+
version: 0.0.26
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '>='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.0.
|
26
|
+
version: 0.0.26
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: ffi
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|