Merge pull request #700 from cuda-geek/fix_build_with_cuda

fix master build with CUDA after latest 2.4 merge
2013-03-25 03:27:31 -07:00
parent 04eabf8d9f dd9e786a8e
commit 8c41c614eb
10 changed files with 45 additions and 40 deletions
--- a/modules/nonfree/src/precomp.hpp
+++ b/modules/nonfree/src/precomp.hpp
@@ -59,7 +59,7 @@
    #include "opencv2/nonfree/gpu.hpp"

    #if defined(HAVE_CUDA)
-        #include "opencv2/gpu/stream_accessor.hpp"
+        #include "opencv2/core/stream_accessor.hpp"
        #include "opencv2/gpu/device/common.hpp"

        static inline void throw_nogpu() { CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform"); }