ropencv 0.0.35 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517c1a1959590086a988d260c740237060aaabba70b6ec0613dcf06bd8696698
-  data.tar.gz: 00fe3546915868ee913b92b36f406d67eee89f8256c3fc3c872ba07a1aaacb3a
+  metadata.gz: e7f44d1f2b9e3a68970e96d7785a940bc45a90a85899c839c4b933ad526c7ba4
+  data.tar.gz: f6e027a5185cfbd01f5a8eb8e2d2f82ff31c4c0bba9222a598c0011ba7c6d3d9
 SHA512:
-  metadata.gz: 1fea1adc6931eae8ba8673b570098f74cf8669892a4c94e259d0c6c172827b97a1e0e35c57edcfd76ae1dbe69402aaed8e88ec91ed665609c354b04d14750551
-  data.tar.gz: ac25f63d6f7baefda1c8dc8a73d604dc6e2ad2a83a9f15b50c269c6435e6ddb6b11d2403129c49c18cb05fc66a8230485068767c10397964d9d289bc1a59c4ed
+  metadata.gz: 825268e6aec2eea80f7f227f1661923b5eaf254e9a6620de105b75a1a9dbd213141840564af26f761f07caa77f5cbfc687a2d86480c400103da7599847ab2b49
+  data.tar.gz: 9b0671631f1c121e59c43c01bbf4f8815d350a1c134b067e96cae1ebd65b00a5156ac1410353df3bb74e2cdd881481980bcaca92589f6a594a0251b50280fbb6

data/ext/helper.rb

@@ -132,10 +132,10 @@ def find_opencv(hint)
               elsif major == 4
                   headers = ["opencv2/core.hpp", "opencv2/core/base.hpp", "opencv2/core/mat.hpp", "opencv2/core/ocl.hpp",
                    "opencv2/core/opengl.hpp", "opencv2/core/optim.hpp", "opencv2/core/persistence.hpp", "opencv2/core/types.hpp",
-                   "opencv2/core/utility.hpp", "opencv2/imgproc.hpp", "opencv2/imgcodecs.hpp", "opencv2/videoio.hpp",
+                   "opencv2/core/utility.hpp", "opencv2/photo.hpp", "opencv2/imgproc.hpp", "opencv2/imgcodecs.hpp", "opencv2/videoio.hpp",
                    "opencv2/highgui.hpp", "opencv2/video/background_segm.hpp", "opencv2/video/tracking.hpp", "opencv2/flann/miniflann.hpp",
-                   "opencv2/ml.hpp", "opencv2/features2d.hpp", "opencv2/calib3d.hpp", "opencv2/objdetect.hpp", "opencv2/photo.hpp",
-                   "opencv2/shape/shape_distance.hpp", "opencv2/shape/shape_transformer.hpp", "opencv2/stitching.hpp",
+                   "opencv2/ml.hpp", "opencv2/features2d.hpp", "opencv2/calib3d.hpp", "opencv2/objdetect.hpp", "opencv2/shape/hist_cost.hpp",
+                   "opencv2/shape/shape_transformer.hpp", "opencv2/shape/shape_distance.hpp", "opencv2/stitching.hpp",
                    "opencv2/stitching/detail/blenders.hpp", "opencv2/stitching/detail/exposure_compensate.hpp", "opencv2/stitching/detail/motion_estimators.hpp",
                    "opencv2/stitching/detail/seam_finders.hpp", "opencv2/stitching/detail/timelapsers.hpp", "opencv2/videostab/motion_core.hpp",
                    "opencv2/viz/types.hpp", "opencv2/viz/widgets.hpp"]

data/ext/post_opencv400.txt

@@ -27,4 +27,12 @@ cv.UMat.UMat
 cv.UMat.UMat
     UMat m
     Rect roi
+cv.Vec3f.dot float
+    Vec3f val
+cv.Vec3f.cross Vec3f
+    Vec3f val
+cv.Vec3d.dot double
+    Vec3d val
+cv.Vec3d.cross Vec3d
+    Vec3d val
 

data/ext/rbind.rb

@@ -49,7 +49,7 @@ elsif major >= 4
     rbind.cv.detail.add_type(Rbind::RClass.new("ImageFeatures"))
     rbind.cv.detail.add_type(Rbind::RClass.new("CameraParams"))
     rbind.cv.detail.add_type(Rbind::RClass.new("MatchesInfo"))
-    if(minor > 5)
+    if(minor == 2)
         rbind.cv.add_type(Rbind::RClass.new("HistogramCostExtractor"))
         rbind.cv.add_type(Rbind::RClass.new("ShapeTransformer"))
     end
@@ -142,7 +142,7 @@ elsif major >= 4
     # mark none polymorphic class
     rbind.ml.DTrees.Params.polymorphic = false if(rbind.ml.DTrees.type?("Params"))
 
-    if minor > 5
+    if minor == 2
         rbind.cv.createShapeContextDistanceExtractor.ignore = true
     end
 end
@@ -155,6 +155,7 @@ rbind.parser.type("std::vector<Vec4i>")
 rbind.parser.type("std::vector<uint32_t>")
 rbind.parser.type("std::vector<uint64_t>")
 rbind.parser.type("std::vector<int8_t>")
+rbind.parser.type("std::vector<int>")
 rbind.parser.type("std::vector<int64_t>")
 rbind.parser.type("std::vector<Scalar>")
 rbind.parser.type("std::vector<Range>")
@@ -191,6 +192,18 @@ Rbind::GeneratorRuby.on_normalize_default_value do |parameter|
     end
 end
 
+# convert some types to ruby types and attach object pointer
+rbind.cv.String.overwrite_ruby do 
+  %{obj = String.new(ptr) 
+	str = obj.to_s
+	def str.__obj_ptr__(obj=nil)
+		@__obj__ ||= obj
+		@__obj__.__obj_ptr__
+	end
+	str.__obj_ptr__(obj)
+	str}
+end
+
 # add version
 cmajor = Rbind::RParameter.new(:CV_VERSION_MAJOR,rbind.parser.type("const int"),major)
 cminor= Rbind::RParameter.new(:CV_VERSION_MINOR,rbind.parser.type("const int"),minor)