Merge branch '2.4'

2012-10-22 16:57:56 +04:00
parent ef6a6cfb40 769f61f8c7
commit 57775988e7
52 changed files with 2143 additions and 1629 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);