Merge pull request #10331 from arrybn:python_dnn_net

eecb64a9 · Vadim Pisarevsky · e72a053c · 19c914db · eecb64a9
Commit eecb64a9 authored Dec 20, 2017 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dnn.hpp modules/dnn/include/opencv2/dnn/dnn.hpp +2 -2

No files found.
--- a/modules/dnn/include/opencv2/dnn/dnn.hpp
+++ b/modules/dnn/include/opencv2/dnn/dnn.hpp
@@ -423,8 +423,8 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
         *  @param outputBlobs contains all output blobs for each layer specified in @p outBlobNames.
         *  @param outBlobNames names for layers which outputs are needed to get
         */
-        void forward(std::vector<std::vector<Mat> >& outputBlobs,
-                     const std::vector<String>& outBlobNames);
+        CV_WRAP_AS(forwardAndRetrieve) void forward(CV_OUT std::vector<std::vector<Mat> >& outputBlobs,
+                                                    const std::vector<String>& outBlobNames);

        /**
         * @brief Compile Halide layers.