Merge pull request #3566 from jet47:cuda-imgproc-refactoring

2015-01-13 11:21:51 +00:00
parent 60cedd7a68 f50a061225
commit 2ecca8f59c
12 changed files with 161 additions and 162 deletions
--- a/modules/core/include/opencv2/core/private.cuda.hpp
+++ b/modules/core/include/opencv2/core/private.cuda.hpp
@@ -130,6 +130,12 @@ namespace cv { namespace cuda
    class NppStreamHandler
    {
    public:
+        inline explicit NppStreamHandler(Stream& newStream)
+        {
+            oldStream = nppGetStream();
+            nppSetStream(StreamAccessor::getStream(newStream));
+        }
+
        inline explicit NppStreamHandler(cudaStream_t newStream)
        {
            oldStream = nppGetStream();