Merge pull request #784 from jet47:fix-gpu-build

modules/core/src/matrix_operations.cpp

@@ -224,7 +224,7 @@ void cv::gpu::CudaMem::create(int _rows, int _cols, int _type, int _alloc_type)
     if (_alloc_type == ALLOC_ZEROCOPY && !canMapHostMemory())
             cv::gpu::error("ZeroCopy is not supported by current device", __FILE__, __LINE__);
 
-    _type &= TYPE_MASK;
+    _type &= Mat::TYPE_MASK;
     if( rows == _rows && cols == _cols && type() == _type && data )
         return;
     if( data )

modules/gpu/test/test_bgfg.cpp

@@ -125,8 +125,8 @@ GPU_TEST_P(FGDStatModel, Update)
 
         ASSERT_EQ(gold_count, count);
 
-        cv::Mat gold_background(model->background);
-        cv::Mat gold_foreground(model->foreground);
+        cv::Mat gold_background = cv::cvarrToMat(model->background);
+        cv::Mat gold_foreground = cv::cvarrToMat(model->foreground);
 
         if (out_cn == 3)
             d_model.background.download(h_background3);

modules/gpu/test/test_precomp.hpp

@@ -64,6 +64,8 @@
 #include <iterator>
 #include <stdexcept>
 
+#include "opencv2/core/private.hpp"
+
 #ifdef HAVE_CUDA
     #include <cuda.h>
     #include <cuda_runtime.h>

modules/highgui/src/window_gtk.cpp

@@ -1096,10 +1096,7 @@ cvShowImage( const char* name, const CvArr* arr )
     #ifdef HAVE_OPENGL
         if (window->useGl)
         {
-            CvMat stub;
-            CvMat* mat = cvGetMat(arr, &stub);
-            cv::Mat im(mat);
-            cv::imshow(name, im);
+            cv::imshow(name, cv::cvarrToMat(arr));
             return;
         }
     #endif

modules/nonfree/src/precomp.hpp

@@ -47,6 +47,7 @@
 #include "opencv2/imgproc.hpp"
 
 #include "opencv2/core/utility.hpp"
+#include "opencv2/core/private.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/superres/src/precomp.hpp

@@ -53,6 +53,7 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video/tracking.hpp"
+#include "opencv2/core/private.hpp"
 
 #ifdef HAVE_OPENCV_GPU
     #include "opencv2/gpu.hpp"