5 Commits

Author	SHA1	Message	Date
Alexander Alekhin	f37f4cf3b4	Merge pull request #9994 from r2d3:dnn_memory_load	2017-11-22 18:15:00 +00:00
Alexander Alekhin	f6d927ef3b	dnn: avoid conflicts with original caffe.proto ... rename caffe.proto => opencv-caffe.proto	2017-11-20 19:04:00 +03:00
David Geldreich	f723cede2e	add loading TensorFlow/Caffe net from memory buffer ... add a corresponding test	2017-11-20 16:28:22 +01:00
Alexander Alekhin	ed10383359	dnn: added trace macros	2017-06-28 14:57:26 +03:00
Alexander Alekhin	93729784bb	dnn: move module from opencv_contrib ... e6f63c7a38/modules/dnn	2017-06-26 13:41:51 +03:00