dnn: rename caffe protobuf package

alalek · alalek · commit 1c88a566e00e · 2017-11-22T18:34:07.000+03:00
diff --git a/modules/dnn/src/caffe/caffe_io.hpp b/modules/dnn/src/caffe/caffe_io.hpp
@@ -92,6 +92,7 @@
 #ifdef HAVE_PROTOBUF
 
 #include "opencv-caffe.pb.h"
+namespace caffe { using namespace opencv_caffe; } // avoid massive renames from caffe proto package
 
 namespace cv {
 namespace dnn {
diff --git a/modules/dnn/src/caffe/opencv-caffe.proto b/modules/dnn/src/caffe/opencv-caffe.proto
@@ -48,7 +48,7 @@
 
 syntax = "proto2";
 
-package caffe;
+package opencv_caffe;
 
 // NVidia's Caffe feature is used to store fp16 weights, https://github.com/NVIDIA/caffe:
 // Math and storage types
