Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4

2012-10-22 13:16:27 +04:00 · 2012-10-22 13:16:27 +04:00 · 8e2f729aa7
commit 8e2f729aa7
parent 99c666691e b14f447cc6
1 changed files with 0 additions and 2 deletions
--- a/modules/gpu/src/surf.cpp
+++ b/modules/gpu/src/surf.cpp
@ -150,8 +150,6 @@ namespace

            sumOffset = bindSumTex(surf_.sum);

-            return;
-
            if (use_mask)
            {
                min(mask, 1.0, surf_.mask1);