dnn: avoid conflicts with original caffe.proto

rename caffe.proto => opencv-caffe.proto
2026-07-31 00:03:03 +04:00 · 2017-11-15 14:07:41 +03:00
parent 75b980ac64
commit f6d927ef3b
6 changed files with 8 additions and 10 deletions
@@ -42,8 +42,6 @@
 #include "../precomp.hpp"

 #ifdef HAVE_PROTOBUF
-#include "caffe.pb.h"
-
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -99,7 +99,6 @@
 #include <fstream>
 #include <vector>

-#include "caffe.pb.h"
 #include "caffe_io.hpp"
 #include "glog_emulator.hpp"

@@ -91,7 +91,7 @@
 #define __OPENCV_DNN_CAFFE_IO_HPP__
 #ifdef HAVE_PROTOBUF

-#include "caffe.pb.h"
+#include "opencv-caffe.pb.h"

 namespace cv {
 namespace dnn {