From 9a9f212db0aea65a12cfc94d76bd39e7bf5bf951 Mon Sep 17 00:00:00 2001 From: Marina Kolpakova Date: Mon, 18 Jun 2012 09:00:28 +0000 Subject: [PATCH] resize function signature refactoring --- modules/gpu/include/opencv2/gpu/gpu.hpp | 2 +- modules/gpu/src/resize.cpp | 4 ++-- modules/gpu/test/test_resize.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp index 58cdd4f860..ad11240f3e 100644 --- a/modules/gpu/include/opencv2/gpu/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu/gpu.hpp @@ -631,7 +631,7 @@ CV_EXPORTS void resize(const GpuMat& src, GpuMat& dst, Size dsize, double fx=0, //! resizes the image //! Supports INTER_AREA -CV_EXPORTS void resize(const GpuMat& src, GpuMat& dst, Size dsize, GpuMat& buffer, double fx=0, double fy=0, int interpolation = INTER_AREA, Stream& stream = Stream::Null()); +CV_EXPORTS void resize(const GpuMat& src, GpuMat& dst, GpuMat& buffer, Size dsize, double fx=0, double fy=0, int interpolation = INTER_AREA, Stream& stream = Stream::Null()); //! warps the image using affine transformation //! Supports INTER_NEAREST, INTER_LINEAR, INTER_CUBIC diff --git a/modules/gpu/src/resize.cpp b/modules/gpu/src/resize.cpp index 7718097a1c..51d2e49b97 100644 --- a/modules/gpu/src/resize.cpp +++ b/modules/gpu/src/resize.cpp @@ -56,7 +56,7 @@ void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, double fx, doub throw_nogpu(); } -void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, GpuMat& buffer, +void cv::gpu::resize(const GpuMat& src, GpuMat& dst,GpuMat& buffer, Size dsize, double fx, double fy, int interpolation, Stream& s) { (void)src; @@ -87,7 +87,7 @@ namespace cv { namespace gpu { namespace device } }}} -void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, GpuMat& buffer, double fx, double fy, +void cv::gpu::resize(const GpuMat& src, GpuMat& dst, GpuMat& buffer, Size dsize, double fx, double fy, int interpolation, Stream& s) { CV_Assert(src.depth() <= CV_32F && src.channels() <= 4); diff --git a/modules/gpu/test/test_resize.cpp b/modules/gpu/test/test_resize.cpp index 879e5c0077..3321f80c31 100644 --- a/modules/gpu/test/test_resize.cpp +++ b/modules/gpu/test/test_resize.cpp @@ -189,7 +189,7 @@ TEST_P(ResizeArea, Accuracy) cv::gpu::GpuMat dst = createMat(cv::Size(cv::saturate_cast(src.cols * coeff), cv::saturate_cast(src.rows * coeff)), type, useRoi); cv::gpu::GpuMat buffer = createMat(cv::Size(dst.cols, src.rows), CV_32FC1); - cv::gpu::resize(loadMat(src, useRoi), dst, cv::Size(), buffer, coeff, coeff, interpolation); + cv::gpu::resize(loadMat(src, useRoi), dst, buffer, cv::Size(), coeff, coeff, interpolation); cv::Mat dst_cpu;