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

8e2f729a · marina.kolpakova · 99c66669 · b14f447c · 8e2f729a
Commit 8e2f729a authored Oct 22, 2012 by marina.kolpakova
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

surf.cpp modules/gpu/src/surf.cpp +0 -2

No files found.
--- 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);