Drop outdated targets and fix solution folders
Add a macro to call additional barrier function on the fly
Add a function to query ocl device info

Currently the function only supports wavefront size query
Pass warp size into SURF
Fix compiler errors
Fix compiler errors
Fix compiler errors
Disable ocl::SURF accurate test
Fix for encoding errors when building Java source

The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e04222deea30ffe4e89456c220bc75ff1a)
Merge pull request #704 from taka-no-me:folders
Merge pull request #707 from pengx17:2.4_surf
Merge pull request #718 from apavlenko:java_tests_fix
Update operations_on_arrays.rst

Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b79eacccf5b93a6fa67478a59ffd246d)
Fix ant/Java detection in cmake scripts

Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.

OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.

This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.(cherry picked from commit a423afddc143f4b10e09e7b253a420b29f877b6c)