Merge commit '4b885e206' into merge-2.4

2013-12-30 16:48:45 +04:00
parent d611509842 4b885e2067
commit 9dfb96389c
8 changed files with 18 additions and 515 deletions
--- a/modules/objdetect/src/haar.cpp
+++ b/modules/objdetect/src/haar.cpp
@@ -336,7 +336,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
            out->isStumpBased &= node_count == 1;
        }
    }
-
+/*
 #ifdef HAVE_IPP
    int can_use_ipp = !out->has_tilted_features && !out->is_tree && out->isStumpBased;

@@ -392,7 +392,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
        }
    }
 #endif
-
+*/
    cascade->hid_cascade = out;
    assert( (char*)haar_node_ptr - (char*)out <= datasize );