Rename tensorflow namespace

diff --git a/modules/dnn/src/tensorflow/attr_value.proto b/modules/dnn/src/tensorflow/attr_value.proto
index 26e42bc..b2289a4 100644 (file)
--- 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 144c75b..6da3e45 100644 (file)
--- 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 478d35a..86f021d 100644 (file)
--- 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 baf68ea..ebdb807 100644 (file)
--- 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 0804218..165e55c 100644 (file)
--- 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 1ec3c53..2a19d9e 100644 (file)
--- 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 aeb22a6..0005ddf 100644 (file)
--- 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 051361b..a0ef65a 100644 (file)
--- 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 7d5e58a..110c199 100644 (file)
--- 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;