fixing compilation issue if no OCL; disabling failing tests
Merge pull request #4 from apavlenko/ocl_surf_24

fixing compilation issue if no OCL; disabling failing tests