generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed MacOS GPU Compilation for i386

Browse Source
This commit is contained in:
Alexander Shishkov
2011-06-16 15:02:58 +00:00
parent c5787c5262
commit f010539aaf
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/src/nvidia/core/NCV.hpp
View File

@@ -112,7 +112,13 @@ namespace NcvCTprep
typedef bool NcvBool; typedef bool NcvBool;
typedef long long Ncv64s; 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 int Ncv32s;
typedef unsigned int Ncv32u; typedef unsigned int Ncv32u;
typedef short Ncv16s; typedef short Ncv16s;

2
modules/gpu/test/nvidia/main_nvidia.cpp
View File

@@ -314,7 +314,7 @@ bool main_nvidia(const std::string& test_data_path)
printf("Initializing data source providers\n"); printf("Initializing data source providers\n");
NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096); NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096);
NCVTestSourceProvider<Ncv8u> testSrcRandom_8u(2010, 0, 255, 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<Ncv8u> testSrcFacesVGA_8u(path + "group_1_640x480_VGA.pgm");
NCVTestSourceProvider<Ncv32f> testSrcRandom_32f(2010, -1.0f, 1.0f, 4096, 4096); NCVTestSourceProvider<Ncv32f> testSrcRandom_32f(2010, -1.0f, 1.0f, 4096, 4096);