potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/init.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ void initializeLayerFactory()
{
CV_TRACE_FUNCTION();
static ProtobufShutdown protobufShutdown; (void)protobufShutdown;
static ProtobufShutdown protobufShutdown; CV_UNUSED(protobufShutdown);
CV_DNN_REGISTER_LAYER_CLASS(Slice, SliceLayer);
CV_DNN_REGISTER_LAYER_CLASS(Split, SplitLayer);