From 993773b74a81d020aea974fb4e575142f04fa165 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 17 Feb 2011 11:09:29 +0000 Subject: [PATCH] now GPU stereo_bp test prints error mesage and test system continues execution --- modules/gpu/src/matrix_operations.cpp | 2 +- modules/gpu/src/multi_gpu_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gpu/src/matrix_operations.cpp b/modules/gpu/src/matrix_operations.cpp index b4018ae..52821f9 100644 --- a/modules/gpu/src/matrix_operations.cpp +++ b/modules/gpu/src/matrix_operations.cpp @@ -65,7 +65,7 @@ namespace cv GpuMat& GpuMat::setTo(const Scalar& /*s*/, const GpuMat& /*mask*/) { throw_nogpu(); return *this; } GpuMat GpuMat::reshape(int /*new_cn*/, int /*new_rows*/) const { throw_nogpu(); return GpuMat(); } void GpuMat::create(int /*_rows*/, int /*_cols*/, int /*_type*/) { throw_nogpu(); } - void GpuMat::release() { throw_nogpu(); } + void GpuMat::release() {} void createContinuous(int /*rows*/, int /*cols*/, int /*type*/, GpuMat& /*m*/) { throw_nogpu(); } diff --git a/modules/gpu/src/multi_gpu_manager.cpp b/modules/gpu/src/multi_gpu_manager.cpp index 68bab7e..8492f70 100644 --- a/modules/gpu/src/multi_gpu_manager.cpp +++ b/modules/gpu/src/multi_gpu_manager.cpp @@ -48,7 +48,7 @@ namespace cv { namespace gpu { class MultiGpuManager::Impl {}; MultiGpuManager::MultiGpuManager() { throw_nogpu(); } -MultiGpuManager::~MultiGpuManager() { throw_nogpu(); } +MultiGpuManager::~MultiGpuManager() {} void MultiGpuManager::init() { throw_nogpu(); } void MultiGpuManager::gpuOn(int) { throw_nogpu(); } void MultiGpuManager::gpuOff() { throw_nogpu(); } -- 2.7.4