Merge pull request #3625 from wangyan42164:ocl_cascade_deadlock
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 21 Jan 2015 10:43:50 +0000 (10:43 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 21 Jan 2015 10:43:50 +0000 (10:43 +0000)
commitb49fa7d384e793e33b884ae161c70cddd2d9d108
treef68aea2d0bcc068ff8e06006fe72b132aecc1046
parent479cac2a1491e05baca9c721dfb98163c0485e73
parentf5b21e81415c417fd3a7db97a2a02c5bd79f12c9
Merge pull request #3625 from wangyan42164:ocl_cascade_deadlock
modules/objdetect/src/cascadedetect.cpp