Merge remote-tracking branch 'upstream/3.4' into merge-3.4

1b588570 · Alexander Alekhin · 2b5eca6e · c5404095 · 1b588570
Commit 1b588570 authored May 10, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

aruco.cpp modules/aruco/src/aruco.cpp +2 -0

No files found.
--- a/modules/aruco/src/aruco.cpp
+++ b/modules/aruco/src/aruco.cpp
@@ -1094,6 +1094,8 @@ static void _apriltag(Mat im_orig, const Ptr<DetectorParameters> & _params, std:

        candidates.push_back(corners);
    }
+
+    _zarray_destroy(quads);
 }