Fixed MacOS GPU Compilation for i386

diff --git a/modules/gpu/src/nvidia/core/NCV.hpp b/modules/gpu/src/nvidia/core/NCV.hpp
index 1715048..3d0781f 100644 (file)
--- a/modules/gpu/src/nvidia/core/NCV.hpp
+++ b/modules/gpu/src/nvidia/core/NCV.hpp
@@ -112,7 +112,13 @@ namespace NcvCTprep
 \r
 typedef               bool NcvBool;\r
 typedef          long long Ncv64s;\r
-typedef unsigned long long Ncv64u;\r
+\r
+#if defined(__APPLE__) && !defined(__CUDACC__)\r
+    typedef uint64_t Ncv64u;\r
+#else\r
+    typedef unsigned long long Ncv64u;\r
+#endif\r
+\r
 typedef                int Ncv32s;\r
 typedef       unsigned int Ncv32u;\r
 typedef              short Ncv16s;\r

diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp
index f2fbcfa..31f0cb1 100644 (file)
--- a/modules/gpu/test/nvidia/main_nvidia.cpp
+++ b/modules/gpu/test/nvidia/main_nvidia.cpp
@@ -314,7 +314,7 @@ bool main_nvidia(const std::string& test_data_path)
     printf("Initializing data source providers\n");\r
     NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096);\r
     NCVTestSourceProvider<Ncv8u> testSrcRandom_8u(2010, 0, 255, 4096, 4096);\r
-    NCVTestSourceProvider<Ncv64u> testSrcRandom_64u(2010, 0, 0xFFFFFFFFFFFFFFFF, 4096, 4096);\r
+    NCVTestSourceProvider<Ncv64u> testSrcRandom_64u(2010, 0, -1, 4096, 4096);\r
     NCVTestSourceProvider<Ncv8u> testSrcFacesVGA_8u(path + "group_1_640x480_VGA.pgm");\r
     NCVTestSourceProvider<Ncv32f> testSrcRandom_32f(2010, -1.0f, 1.0f, 4096, 4096);\r
 \r