opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-21 23:01:45 +08:00
Code Issues Releases Wiki Activity
1,741 Commits 5 Branches 56 Tags
8e68d837dee5b8047e387cc3fc27d61a38f42d77
Commit Graph

7 Commits

Author SHA1 Message Date
Vitaliy Lyudvichenko
8e68d837de Merge branch 'object_detection_sample_ssd' into dnn* 
# Conflicts:
#	modules/dnn/include/opencv2/dnn/blob.hpp
#	modules/dnn/src/init.cpp
#	modules/dnn/src/layers/concat_layer.cpp
#	modules/dnn/src/layers/convolution_layer.cpp
#	modules/dnn/src/layers/convolution_layer.hpp
#	modules/dnn/src/layers/layers_common.cpp
#	modules/dnn/src/layers/layers_common.hpp
#	modules/dnn/src/layers/op_im2col.hpp
#	modules/dnn/src/layers/pooling_layer.cpp
#	modules/dnn/src/layers/pooling_layer.hpp
 2016-08-18 00:41:26 +03:00
apetrovichev
e88b06183c Fixed warning in the sample 2016-08-01 19:59:33 +03:00
Anna Petrovicheva
083616d05f Fixed warnings 2016-07-22 16:15:45 +03:00
Anna Petrovicheva
1f020151c3 Finalized the sample 2016-07-22 15:39:47 +03:00
Anna Petrovicheva
740ca1d26a Finalized the sample 2016-07-22 15:39:47 +03:00
Anna Petrovicheva
355d07ecef Network initialized successfully 2016-07-22 15:37:04 +03:00
Anna Petrovicheva
b65a84fac0 Modified the sample 2016-07-22 15:37:04 +03:00