Merge pull request #10139 from alalek:dnn_rename_caffe_proto_package

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 {

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