potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Do not build protobuf without dnn (#10689)

Browse Source 
* Do not build protobuf if dnn is disabled

* Added BUILD_LIST cmake option to the cache

* Moved protobuf to the top level

* Fixed static build

* Fixed world build

* fixup! Fixed world build
This commit is contained in:
Maksim Shabunin
2018-02-01 16:30:23 +03:00
committed by Vadim Pisarevsky
parent 36222c9eed
commit e56d6054aa
8 changed files with 113 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/caffe/caffe_shrinker.cpp
+4
View File
@@ -54,7 +54,11 @@ void shrinkCaffeModel(const String& src, const String& dst, const std::vector<St
blob->set_raw_data_type(caffe::FLOAT16);
}
}
#if GOOGLE_PROTOBUF_VERSION < 3005000
size_t msgSize = saturate_cast<size_t>(net.ByteSize());
#else
size_t msgSize = net.ByteSizeLong();
#endif
std::vector<uint8_t> output(msgSize);
net.SerializeWithCachedSizesToArray(&output[0]);