Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 6 Feb 2014 08:55:04 +0000 (12:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 6 Feb 2014 08:55:04 +0000 (12:55 +0400)
commitb6675ee2a85f957e352aef05f31b31b16428387c
treef3fde729b77f0d676453badd3ee7043f1fac9511
parent721d0145e0e9c9b65e3e2ab0457868773c4702c3
parentbdfa9fa14a48614fb0d40e47d86fddd517aec8c6
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
modules/features2d/include/opencv2/features2d.hpp
modules/nonfree/include/opencv2/nonfree/features2d.hpp
modules/nonfree/src/surf.cpp