[opencv] 30/33: revert previous change in gpu::StereoBeliefPropogation (cherry picked from commit f903192c17b1c70182c0c25bb156900ea82b731b)

Mattia Rizzolo mattia at debian.org
Tue Oct 4 17:51:06 UTC 2016


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.12.2
in repository opencv.

commit c22cc67ba8b549e4883e2f6a40495ba3db465a77
Author: Vladislav Vinogradov <vlad.vinogradov at itseez.com>
Date:   Thu Sep 10 10:05:04 2015 +0300

    revert previous change in gpu::StereoBeliefPropogation
    (cherry picked from commit f903192c17b1c70182c0c25bb156900ea82b731b)
---
 modules/gpu/src/stereobp.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gpu/src/stereobp.cpp b/modules/gpu/src/stereobp.cpp
index dde69d6..0864fbc 100644
--- a/modules/gpu/src/stereobp.cpp
+++ b/modules/gpu/src/stereobp.cpp
@@ -213,8 +213,8 @@ namespace
 
             if (rthis.levels > 1)
             {
-                int less_rows = rows / 2;
-                int less_cols = cols / 2;
+                int less_rows = (rows + 1) / 2;
+                int less_cols = (cols + 1) / 2;
 
                 createContinuous(less_rows * rthis.ndisp, less_cols, rthis.msg_type, u2);
                 createContinuous(less_rows * rthis.ndisp, less_cols, rthis.msg_type, d2);
@@ -283,8 +283,8 @@ namespace
 
             for (int i = 1; i < rthis.levels; ++i)
             {
-                cols_all[i] = cols_all[i-1] / 2;
-                rows_all[i] = rows_all[i-1] / 2;
+                cols_all[i] = (cols_all[i-1] + 1) / 2;
+                rows_all[i] = (rows_all[i-1] + 1) / 2;
 
                 createContinuous(rows_all[i] * rthis.ndisp, cols_all[i], rthis.msg_type, datas[i]);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git



More information about the debian-science-commits mailing list