mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

restore missed gpu functionality after merge #dddd285d

Browse Source
This commit is contained in:
marina.kolpakova 2013-02-24 22:14:57 +04:00
parent dddd285d3b
commit ef6c236655
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/gpumat.hpp
View File

@ -143,6 +143,7 @@ namespace cv { namespace gpu
int multi_processor_count_; int multi_processor_count_;
int majorVersion_; int majorVersion_;
int minorVersion_; int minorVersion_;
size_t sharedMemPerBlock_;
}; };
CV_EXPORTS void printCudaDeviceInfo(int device); CV_EXPORTS void printCudaDeviceInfo(int device);

9
modules/core/src/gpumat.cpp
View File

@ -379,6 +379,8 @@ void cv::gpu::DeviceInfo::query()
sharedMemPerBlock_ = prop.sharedMemPerBlock; sharedMemPerBlock_ = prop.sharedMemPerBlock;
} }
size_t cv::gpu::DeviceInfo::sharedMemPerBlock() const {return sharedMemPerBlock_;}
void cv::gpu::DeviceInfo::queryMemory(size_t& free_memory, size_t& total_memory) const void cv::gpu::DeviceInfo::queryMemory(size_t& free_memory, size_t& total_memory) const
{ {
int prev_device_id = getDevice(); int prev_device_id = getDevice();
@ -802,6 +804,13 @@ void cv::gpu::ensureSizeIsEnough(int rows, int cols, int type, GpuMat& m)
} }
} }
GpuMat cv::gpu::allocMatFromBuf(int rows, int cols, int type, GpuMat &mat)
{
if (!mat.empty() && mat.type() == type && mat.rows >= rows && mat.cols >= cols)
return mat(Rect(0, 0, cols, rows));
return mat = GpuMat(rows, cols, type);
}
namespace namespace
{ {
class GpuFuncTable class GpuFuncTable