Merge pull request #11572 from nglee:dev_fixNppStreamHandlerDtor

6c06fcee · Alexander Alekhin · 2f9b4439 · 79af0bfc · 6c06fcee
Commit 6c06fcee authored May 23, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

private.cuda.hpp modules/core/include/opencv2/core/private.cuda.hpp +1 -1

No files found.
--- a/modules/core/include/opencv2/core/private.cuda.hpp
+++ b/modules/core/include/opencv2/core/private.cuda.hpp
@@ -152,7 +152,7 @@ namespace cv { namespace cuda

        inline ~NppStreamHandler()
        {
-            cudaStreamSynchronize(oldStream);
+            nppSafeSetStream(nppGetStream(), oldStream);
        }

    private: