projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9087778
da09603
)
Merge pull request #9028 from alalek:dnn_experimental_namespace
author
Maksim Shabunin
<maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:37:04 +0000
(07:37 +0000)
committer
Maksim Shabunin
<maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:37:04 +0000
(07:37 +0000)
1
2
modules/dnn/src/caffe/caffe_importer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/dnn.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/init.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/precomp.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/tensorflow/tf_importer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/dnn/src/torch/torch_importer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/dnn/src/caffe/caffe_importer.cpp
index
7c33812
,
3f61310
..
c075651
---
1
/
modules/dnn/src/caffe/caffe_importer.cpp
---
2
/
modules/dnn/src/caffe/caffe_importer.cpp
+++ b/
modules/dnn/src/caffe/caffe_importer.cpp
@@@
-40,10
-40,8
+40,8
@@@
//M*/
#include "../precomp.hpp"
- using namespace cv;
- using namespace cv::dnn;
-#if HAVE_PROTOBUF
+#if
def
HAVE_PROTOBUF
#include "caffe.pb.h"
#include <iostream>
diff --cc
modules/dnn/src/dnn.cpp
Simple merge
diff --cc
modules/dnn/src/init.cpp
Simple merge
diff --cc
modules/dnn/src/precomp.hpp
Simple merge
diff --cc
modules/dnn/src/tensorflow/tf_importer.cpp
index
592dc99
,
8a39d7b
..
7797fa7
---
1
/
modules/dnn/src/tensorflow/tf_importer.cpp
---
2
/
modules/dnn/src/tensorflow/tf_importer.cpp
+++ b/
modules/dnn/src/tensorflow/tf_importer.cpp
@@@
-10,10
-10,8
+10,8
@@@
Implementation of Tensorflow models par
*/
#include "../precomp.hpp"
- using namespace cv;
- using namespace cv::dnn;
-#if HAVE_PROTOBUF
+#if
def
HAVE_PROTOBUF
#include "graph.pb.h"
#include <iostream>
diff --cc
modules/dnn/src/torch/torch_importer.cpp
Simple merge