Commit 50166d27 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

fixed compilation with CUDA 4.2

parent 84262acb
...@@ -569,7 +569,12 @@ int cv::gpu::DeviceInfo::maxTexture1DMipmap() const ...@@ -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 ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment