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

Merge pull request #1027 from jet47:fix-cuda-4.2-build

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-20 14:11:51 +04:00 committed by OpenCV Buildbot
commit 13323882d4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/src/gpu_info.cpp
View File

@ -569,7 +569,12 @@ int cv::gpu::DeviceInfo::maxTexture1DMipmap() const
throw_no_cuda(); throw_no_cuda();
return 0; return 0;
#else #else
return deviceProps().get(device_id_)->maxTexture1DMipmap; #if CUDA_VERSION >= 5000
return deviceProps().get(device_id_)->maxTexture1DMipmap;
#else
CV_Error(Error::StsNotImplemented, "This function requires CUDA 5.0");
return 0;
#endif
#endif #endif
} }
@ -599,7 +604,12 @@ Vec2i cv::gpu::DeviceInfo::maxTexture2DMipmap() const
throw_no_cuda(); throw_no_cuda();
return Vec2i(); return Vec2i();
#else #else
return Vec2i(deviceProps().get(device_id_)->maxTexture2DMipmap); #if CUDA_VERSION >= 5000
return Vec2i(deviceProps().get(device_id_)->maxTexture2DMipmap);
#else
CV_Error(Error::StsNotImplemented, "This function requires CUDA 5.0");
return Vec2i();
#endif
#endif #endif
} }