Merge pull request #1164 from bitwangyaoyao:master_fixHaar
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 12:14:23 +0000 (16:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 12:14:24 +0000 (16:14 +0400)
commitcd62f9f7cb8cd000f36f941d889cd95bc8e525ee
tree5e1d8a1fefb07630756879e070de35a1ac029ef0
parentc5e569d1782c5809e9af2625787b918a117af6a3
parent3d3e9ab6357de2293c064aaa95b9b39785719086
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/test/test_objdetect.cpp