Merge pull request #10139 from alalek:dnn_rename_caffe_proto_package

2017-11-23 14:10:42 +00:00 · 2017-11-23 14:10:42 +00:00 · 49a5280198
commit 49a5280198
parent e5d1790b7b b29893b938
4 changed files with 9624 additions and 9596 deletions
--- a/modules/dnn/misc/caffe/opencv-caffe.pb.cc
+++ b/modules/dnn/misc/caffe/opencv-caffe.pb.cc
--- a/modules/dnn/misc/caffe/opencv-caffe.pb.h
+++ b/modules/dnn/misc/caffe/opencv-caffe.pb.h
--- 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 {
--- 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