projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
[platform/upstream/opencv.git]
/
modules
/
dnn
/
include
/
opencv2
/
dnn
/
dnn.hpp
diff --git
a/modules/dnn/include/opencv2/dnn/dnn.hpp
b/modules/dnn/include/opencv2/dnn/dnn.hpp
index
9371d12
..
127b761
100644
(file)
--- a/
modules/dnn/include/opencv2/dnn/dnn.hpp
+++ b/
modules/dnn/include/opencv2/dnn/dnn.hpp
@@
-955,13
+955,6
@@
CV__DNN_INLINE_NS_BEGIN
CV_OUT std::vector<int>& indices,
const float eta = 1.f, const int top_k = 0);
CV_OUT std::vector<int>& indices,
const float eta = 1.f, const int top_k = 0);
- /** @brief Release a Myriad device is binded by OpenCV.
- *
- * Single Myriad device cannot be shared across multiple processes which uses
- * Inference Engine's Myriad plugin.
- */
- CV_EXPORTS_W void resetMyriadDevice();
-
//! @}
CV__DNN_INLINE_NS_END
}
//! @}
CV__DNN_INLINE_NS_END
}
@@
-970,4
+963,7
@@
CV__DNN_INLINE_NS_END
#include <opencv2/dnn/layer.hpp>
#include <opencv2/dnn/dnn.inl.hpp>
#include <opencv2/dnn/layer.hpp>
#include <opencv2/dnn/dnn.inl.hpp>
+/// @deprecated Include this header directly from application. Automatic inclusion will be removed
+#include <opencv2/dnn/utils/inference_engine.hpp>
+
#endif /* OPENCV_DNN_DNN_HPP */
#endif /* OPENCV_DNN_DNN_HPP */