From f010539aaf84884ba0945dfa18a71e713222aaf1 Mon Sep 17 00:00:00 2001
From: Alexander Shishkov <no@email>
Date: Thu, 16 Jun 2011 15:02:58 +0000
Subject: [PATCH] Fixed MacOS GPU Compilation for i386

---
 modules/gpu/src/nvidia/core/NCV.hpp     | 8 +++++++-
 modules/gpu/test/nvidia/main_nvidia.cpp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/gpu/src/nvidia/core/NCV.hpp b/modules/gpu/src/nvidia/core/NCV.hpp
index 1715048..3d0781f 100644
--- a/modules/gpu/src/nvidia/core/NCV.hpp
+++ b/modules/gpu/src/nvidia/core/NCV.hpp
@@ -112,7 +112,13 @@ namespace NcvCTprep
 
 typedef               bool NcvBool;
 typedef          long long Ncv64s;
-typedef unsigned long long Ncv64u;
+
+#if defined(__APPLE__) && !defined(__CUDACC__)
+    typedef uint64_t Ncv64u;
+#else
+    typedef unsigned long long Ncv64u;
+#endif
+
 typedef                int Ncv32s;
 typedef       unsigned int Ncv32u;
 typedef              short Ncv16s;
diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp
index f2fbcfa..31f0cb1 100644
--- 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");
     NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096);
     NCVTestSourceProvider<Ncv8u> testSrcRandom_8u(2010, 0, 255, 4096, 4096);
-    NCVTestSourceProvider<Ncv64u> testSrcRandom_64u(2010, 0, 0xFFFFFFFFFFFFFFFF, 4096, 4096);
+    NCVTestSourceProvider<Ncv64u> testSrcRandom_64u(2010, 0, -1, 4096, 4096);
     NCVTestSourceProvider<Ncv8u> testSrcFacesVGA_8u(path + "group_1_640x480_VGA.pgm");
     NCVTestSourceProvider<Ncv32f> testSrcRandom_32f(2010, -1.0f, 1.0f, 4096, 4096);
 
-- 
2.7.4