From cb5da8983f911002ba8a316695c634111a62d274 Mon Sep 17 00:00:00 2001
From: George Mironov <mironovga@gmail.com>
Date: Wed, 12 Sep 2018 15:08:56 +0300
Subject: [PATCH] Rename tensorflow namespace

---
 modules/dnn/src/tensorflow/attr_value.proto   | 2 +-
 modules/dnn/src/tensorflow/function.proto     | 2 +-
 modules/dnn/src/tensorflow/graph.proto        | 2 +-
 modules/dnn/src/tensorflow/op_def.proto       | 2 +-
 modules/dnn/src/tensorflow/tensor.proto       | 2 +-
 modules/dnn/src/tensorflow/tensor_shape.proto | 2 +-
 modules/dnn/src/tensorflow/tf_io.hpp          | 1 +
 modules/dnn/src/tensorflow/types.proto        | 2 +-
 modules/dnn/src/tensorflow/versions.proto     | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/dnn/src/tensorflow/attr_value.proto b/modules/dnn/src/tensorflow/attr_value.proto
index 26e42bc1a1..b2289a4c2a 100644
--- a/modules/dnn/src/tensorflow/attr_value.proto
+++ b/modules/dnn/src/tensorflow/attr_value.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "AttrValueProtos";
 option java_multiple_files = true;
diff --git a/modules/dnn/src/tensorflow/function.proto b/modules/dnn/src/tensorflow/function.proto
index 144c75bf32..6da3e4577a 100644
--- a/modules/dnn/src/tensorflow/function.proto
+++ b/modules/dnn/src/tensorflow/function.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "FunctionProtos";
 option java_multiple_files = true;
diff --git a/modules/dnn/src/tensorflow/graph.proto b/modules/dnn/src/tensorflow/graph.proto
index 478d35a9fe..86f021daff 100644
--- a/modules/dnn/src/tensorflow/graph.proto
+++ b/modules/dnn/src/tensorflow/graph.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "GraphProtos";
 option java_multiple_files = true;
diff --git a/modules/dnn/src/tensorflow/op_def.proto b/modules/dnn/src/tensorflow/op_def.proto
index baf68eaad3..ebdb807c2d 100644
--- a/modules/dnn/src/tensorflow/op_def.proto
+++ b/modules/dnn/src/tensorflow/op_def.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "OpDefProtos";
 option java_multiple_files = true;
diff --git a/modules/dnn/src/tensorflow/tensor.proto b/modules/dnn/src/tensorflow/tensor.proto
index 080421809e..165e55ce3d 100644
--- a/modules/dnn/src/tensorflow/tensor.proto
+++ b/modules/dnn/src/tensorflow/tensor.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "TensorProtos";
 option java_multiple_files = true;
diff --git a/modules/dnn/src/tensorflow/tensor_shape.proto b/modules/dnn/src/tensorflow/tensor_shape.proto
index 1ec3c5323c..2a19d9e934 100644
--- a/modules/dnn/src/tensorflow/tensor_shape.proto
+++ b/modules/dnn/src/tensorflow/tensor_shape.proto
@@ -6,7 +6,7 @@ option java_outer_classname = "TensorShapeProtos";
 option java_multiple_files = true;
 option java_package = "org.tensorflow.framework";
 
-package tensorflow;
+package opencv_tensorflow;
 
 // Dimensions of a tensor.
 message TensorShapeProto {
diff --git a/modules/dnn/src/tensorflow/tf_io.hpp b/modules/dnn/src/tensorflow/tf_io.hpp
index aeb22a6c27..0005ddfdd3 100644
--- a/modules/dnn/src/tensorflow/tf_io.hpp
+++ b/modules/dnn/src/tensorflow/tf_io.hpp
@@ -26,6 +26,7 @@ Declaration of various functions which are related to Tensorflow models reading.
 #pragma GCC diagnostic pop
 #endif
 
+namespace tensorflow { using namespace opencv_tensorflow; }
 
 namespace cv {
 namespace dnn {
diff --git a/modules/dnn/src/tensorflow/types.proto b/modules/dnn/src/tensorflow/types.proto
index 051361bbed..a0ef65ace5 100644
--- a/modules/dnn/src/tensorflow/types.proto
+++ b/modules/dnn/src/tensorflow/types.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "TypesProtos";
 option java_multiple_files = true;
diff --git a/modules/dnn/src/tensorflow/versions.proto b/modules/dnn/src/tensorflow/versions.proto
index 7d5e58ae7d..110c19962f 100644
--- a/modules/dnn/src/tensorflow/versions.proto
+++ b/modules/dnn/src/tensorflow/versions.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package tensorflow;
+package opencv_tensorflow;
 option cc_enable_arenas = true;
 option java_outer_classname = "VersionsProtos";
 option java_multiple_files = true;