From 9ad7a1c927c9130e2ce57fd373e7f9ecd1bcfb77 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 25 Nov 2010 11:52:15 +0000 Subject: [PATCH] fixed compile time errors in gpu module (if one compiles without CUDA) --- modules/gpu/src/arithm.cpp | 2 +- modules/gpu/src/hog.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/gpu/src/arithm.cpp b/modules/gpu/src/arithm.cpp index ca31707c0..e9cc31556 100644 --- a/modules/gpu/src/arithm.cpp +++ b/modules/gpu/src/arithm.cpp @@ -66,7 +66,7 @@ double cv::gpu::norm(const GpuMat&, const GpuMat&, int) { throw_nogpu(); return void cv::gpu::flip(const GpuMat&, GpuMat&, int) { throw_nogpu(); } Scalar cv::gpu::sum(const GpuMat&) { throw_nogpu(); return Scalar(); } void cv::gpu::minMax(const GpuMat&, double*, double*) { throw_nogpu(); } -void cv::gou::minMax(const GpuMat&, double*, double*, GpuMat&) { throw_nogpu(); } +void cv::gpu::minMax(const GpuMat&, double*, double*, GpuMat&) { throw_nogpu(); } void cv::gpu::minMaxLoc(const GpuMat&, double*, double*, Point*, Point*) { throw_nogpu(); } void cv::gpu::LUT(const GpuMat&, const Mat&, GpuMat&) { throw_nogpu(); } void cv::gpu::exp(const GpuMat&, GpuMat&) { throw_nogpu(); } diff --git a/modules/gpu/src/hog.cpp b/modules/gpu/src/hog.cpp index 9524d1870..888364555 100644 --- a/modules/gpu/src/hog.cpp +++ b/modules/gpu/src/hog.cpp @@ -52,6 +52,7 @@ bool cv::gpu::HOGDescriptor::checkDetectorSize() const { throw_nogpu(); return f void cv::gpu::HOGDescriptor::setSVMDetector(const vector&) { throw_nogpu(); } void cv::gpu::HOGDescriptor::detect(const GpuMat&, vector&, double, Size, Size) { throw_nogpu(); } void cv::gpu::HOGDescriptor::detectMultiScale(const GpuMat&, vector&, double, Size, Size, double, int) { throw_nogpu(); } +void cv::gpu::HOGDescriptor::computeBlockHistograms(const GpuMat&) { throw_nogpu(); } void cv::gpu::HOGDescriptor::getDescriptors(const GpuMat&, Size, GpuMat&, int) { throw_nogpu(); } std::vector cv::gpu::HOGDescriptor::getDefaultPeopleDetector() { throw_nogpu(); return std::vector(); } std::vector cv::gpu::HOGDescriptor::getPeopleDetector_48x96() { throw_nogpu(); return std::vector(); }