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

Code review fixes.

Browse Source
This commit is contained in:
Alexander Smorkalov
2013-12-20 16:32:34 +04:00
parent 529bd41751
commit bc72f4d2a2
11 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/dynamicuda/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
if(NOT ANDROID OR NOT HAVE_CUDA)
if(NOT DYNAMIC_CUDA_SUPPORT)
ocv_module_disable(dynamicuda)
endif()
@@ -11,5 +11,5 @@ set(OPENCV_MODULE_TYPE SHARED)
if (BUILD_FAT_JAVA_LIB)
ocv_define_module(dynamicuda opencv_java PRIVATE_REQUIRED ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
else()
ocv_define_module(dynamicuda opencv_core PRIVATE_REQUIRED q${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
ocv_define_module(dynamicuda opencv_core PRIVATE_REQUIRED ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
endif()

4
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
View File

@@ -539,7 +539,7 @@ private:
DeviceProps deviceProps;
class CudaDeviceInfoFuncTable: DeviceInfoFuncTable
class CudaDeviceInfoFuncTable : public DeviceInfoFuncTable
{
public:
size_t sharedMemPerBlock() const
@@ -1109,4 +1109,4 @@ public:
}
};
#endif
#endif
#endif