kotovalexarian-likes-github/ruby-opencv
1
0
Fork 0
mirror of https://github.com/ruby-opencv/ruby-opencv synced 2023-03-27 23:22:12 -04:00
Code Releases Activity

Simplified layers and bug fix.

Browse source
This commit is contained in:
Francois Deschenes 2018-07-27 00:38:05 -07:00
parent ac88971aff
commit c3e0e76a5f
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/opencv/dnn_net.cpp
View file

@ -147,12 +147,10 @@ namespace rubyopencv {
VALUE rb_get_layers(VALUE self) { VALUE rb_get_layers(VALUE self) {
cv::dnn::Net* selfptr = obj2net(self); cv::dnn::Net* selfptr = obj2net(self);
std::vector<cv::String> layer_names = selfptr->getLayerNames(); long size = selfptr->getLayerNames().size();
const long size = layer_names.size();
VALUE layers = rb_ary_new_capa(size); VALUE layers = rb_ary_new_capa(size);
for (long i = 0; i < size; i++) { for (long i = 0; i < size; i++) {
VALUE layer = Dnn::Layer::layer2obj(selfptr->getLayer(layer_names[i])); VALUE layer = Dnn::Layer::layer2obj(selfptr->getLayer((int)i + 1));
rb_ary_store(layers, i, layer); rb_ary_store(layers, i, layer);
} }

2
ext/opencv/dnn_net.hpp
View file

@ -12,7 +12,7 @@ namespace rubyopencv {
VALUE rb_read_net(int argc, VALUE *argv, VALUE self); VALUE rb_read_net(int argc, VALUE *argv, VALUE self);
VALUE rb_read_net_from_caffe(VALUE self, VALUE prototxt, VALUE caffe_model); VALUE rb_read_net_from_caffe(VALUE self, VALUE prototxt, VALUE caffe_model);
VALUE rb_read_net_from_tensorflow(VALUE self, VALUE model, VALUE config); VALUE rb_read_net_from_tensorflow(VALUE self, VALUE model, VALUE config);
VALUE rb_read_net_from_torch(VALUE self, VALUE model); VALUE rb_read_net_from_torch(int argc, VALUE *argv, VALUE self);
VALUE rb_read_net_from_darknet(VALUE self, VALUE cfg_file, VALUE darknet_model); VALUE rb_read_net_from_darknet(VALUE self, VALUE cfg_file, VALUE darknet_model);
} }
} }