From 0aab7795326c5a56039c6a7eed7d4bb7f78277e3 Mon Sep 17 00:00:00 2001 From: Alexander Karsakov Date: Fri, 24 Oct 2014 11:03:10 +0300 Subject: [PATCH] Overload PlaneWarper::buildMaps method from base class --- .../stitching/include/opencv2/stitching/detail/warpers.hpp | 1 + modules/stitching/src/opencl/warpers.cl | 4 ++-- modules/stitching/src/warpers.cpp | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp index c8869f116d..ac9e256ad7 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp @@ -135,6 +135,7 @@ public: Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R, InputArray T); virtual Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, OutputArray xmap, OutputArray ymap); + Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap); virtual Point warp(InputArray src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode, OutputArray dst); diff --git a/modules/stitching/src/opencl/warpers.cl b/modules/stitching/src/opencl/warpers.cl index 7ec87ae2f8..9d245893cf 100644 --- a/modules/stitching/src/opencl/warpers.cl +++ b/modules/stitching/src/opencl/warpers.cl @@ -57,7 +57,7 @@ __kernel void buildWarpPlaneMaps(__global uchar * xmapptr, int xmap_step, int xm int ymap_index = mad24(dv0, ymap_step, mad24(du, (int)sizeof(float), ymap_offset)); float u = tl_u + du; - float x_ = u * scale - ct[0]; + float x_ = fma(u, scale, -ct[0]); float ct1 = 1 - ct[2]; for (int dv = dv0, dv1 = min(rows, dv0 + rowsPerWI); dv < dv1; ++dv, xmap_index += xmap_step, @@ -67,7 +67,7 @@ __kernel void buildWarpPlaneMaps(__global uchar * xmapptr, int xmap_step, int xm __global float * ymap = (__global float *)(ymapptr + ymap_index); float v = tl_v + dv; - float y_ = v * scale - ct[1]; + float y_ = fma(v, scale, -ct[1]); float x = fma(ck_rinv[0], x_, fma(ck_rinv[1], y_, ck_rinv[2] * ct1)); float y = fma(ck_rinv[3], x_, fma(ck_rinv[4], y_, ck_rinv[5] * ct1)); diff --git a/modules/stitching/src/warpers.cpp b/modules/stitching/src/warpers.cpp index 2711a012f6..744474ba6e 100644 --- a/modules/stitching/src/warpers.cpp +++ b/modules/stitching/src/warpers.cpp @@ -87,6 +87,11 @@ Point2f PlaneWarper::warpPoint(const Point2f &pt, InputArray K, InputArray R, In return uv; } +Rect PlaneWarper::buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) +{ + return buildMaps(src_size, K, R, Mat::zeros(3, 1, CV_32FC1), xmap, ymap); +} + Rect PlaneWarper::buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, OutputArray _xmap, OutputArray _ymap) { projector_.setCameraParams(K, R, T);