fixed some warnings and errors under g++

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

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;