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

fixed some warnings and errors under g++

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-02-03 14:51:58 +00:00
parent 97b0335ef6
commit 50429d8a3e
8 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gpu/src/imgproc_gpu.cpp
View File

@@ -1258,7 +1258,7 @@ Size cv::gpu::ConvolveBuf::estimateBlockSize(Size result_size, Size templ_size)
Size bsize_min(1024, 1024);
// Check whether we use Fermi generation or newer GPU
if (DeviceInfo().major() >= 2)
if (DeviceInfo().majorVersion() >= 2)
{
bsize_min.width = 2048;
bsize_min.height = 2048;
@@ -1295,7 +1295,6 @@ void cv::gpu::convolve(const GpuMat& image, const GpuMat& templ, GpuMat& result,
Size& block_size = buf.block_size;
Size& dft_size = buf.dft_size;
int& spect_len = buf.spect_len;
GpuMat& image_block = buf.image_block;
GpuMat& templ_block = buf.templ_block;

17
modules/gpu/src/initialization.cpp
View File

@@ -175,23 +175,20 @@ size_t cv::gpu::DeviceInfo::totalMemory() const
bool cv::gpu::DeviceInfo::has(cv::gpu::GpuFeature feature) const
{
if (feature == NATIVE_DOUBLE)
return major() > 1 || (major() == 1 && minor() >= 3);
if (feature == ATOMICS)
return major() > 1 || (major() == 1 && minor() >= 1);
return false;
int version = majorVersion() * 10 + minorVersion();
return version >= feature;
}
bool cv::gpu::DeviceInfo::isCompatible() const
{
// Check PTX compatibility
if (TargetArchs::hasEqualOrLessPtx(major(), minor()))
if (TargetArchs::hasEqualOrLessPtx(majorVersion(), minorVersion()))
return true;
// Check BIN compatibility
for (int i = minor(); i >= 0; --i)
if (TargetArchs::hasBin(major(), i))
for (int i = minorVersion(); i >= 0; --i)
if (TargetArchs::hasBin(majorVersion(), i))
return true;
return false;
@@ -204,8 +201,8 @@ void cv::gpu::DeviceInfo::query()
cudaSafeCall(cudaGetDeviceProperties(&prop, device_id_));
name_ = prop.name;
multi_processor_count_ = prop.multiProcessorCount;
major_ = prop.major;
minor_ = prop.minor;
majorVersion_ = prop.major;
minorVersion_ = prop.minor;
}

2
modules/gpu/src/stereobm.cpp
View File

@@ -88,7 +88,7 @@ bool cv::gpu::StereoBM_GPU::checkIfGpuCallReasonable()
DeviceInfo device_info;
if (device_info.major() > 1 || device_info.multiProcessorCount() > 16)
if (device_info.majorVersion() > 1 || device_info.multiProcessorCount() > 16)
return true;
return false;