From 74197c5b1429b7f875e371a4194b3ed89ef3bdc7 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 16 Dec 2010 08:46:47 +0000 Subject: [PATCH] fixed link time error in gpu module --- modules/gpu/src/match_template.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/gpu/src/match_template.cpp b/modules/gpu/src/match_template.cpp index da870c779..28e5b784c 100644 --- a/modules/gpu/src/match_template.cpp +++ b/modules/gpu/src/match_template.cpp @@ -62,13 +62,13 @@ namespace cv { namespace gpu { namespace imgproc void multiplyAndNormalizeSpects(int n, float scale, const cufftComplex* a, const cufftComplex* b, cufftComplex* c); - void matchTemplateNaive_8U_SQDIFF( - const DevMem2D image, const DevMem2D templ, DevMem2Df result); + void matchTemplateNaive_SQDIFF_8U( + const DevMem2D image, const DevMem2D templ, DevMem2Df result, int cn); - void matchTemplateNaive_32F_SQDIFF( - const DevMem2D image, const DevMem2D templ, DevMem2Df result); + void matchTemplateNaive_SQDIFF_32F( + const DevMem2D image, const DevMem2D templ, DevMem2Df result, int cn); - void matchTemplatePrepared_8U_SQDIFF( + void matchTemplatePrepared_SQDIFF_8U( int w, int h, const DevMem2Df image_sumsq, float templ_sumsq, DevMem2Df result); }}} @@ -98,7 +98,7 @@ namespace void matchTemplate_32F_SQDIFF(const GpuMat& image, const GpuMat& templ, GpuMat& result) { result.create(image.rows - templ.rows + 1, image.cols - templ.cols + 1, CV_32F); - imgproc::matchTemplateNaive_32F_SQDIFF(image, templ, result); + imgproc::matchTemplateNaive_SQDIFF_32F(image, templ, result, 1); } @@ -243,7 +243,7 @@ namespace void matchTemplate_8U_SQDIFF(const GpuMat& image, const GpuMat& templ, GpuMat& result) { result.create(image.rows - templ.rows + 1, image.cols - templ.cols + 1, CV_32F); - imgproc::matchTemplateNaive_8U_SQDIFF(image, templ, result); + imgproc::matchTemplateNaive_SQDIFF_8U(image, templ, result, 1); }