[arrayfire] 335/408: Merge pull request #965 from pavanky/nonfree_fixes

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository arrayfire.

commit af7681f662b2864129546e5370a8c3736b9692d0
Merge: c071d86 7fb28f6
Author: Umar Arshad <umar at arrayfire.com>
Date:   Mon Aug 24 17:11:17 2015 -0400

    Merge pull request #965 from pavanky/nonfree_fixes
    
    Fixes to building nonfree algorithms

 CMakeLists.txt                                     |   24 +-
 src/api/c/sift.cpp                                 |    2 +-
 src/backend/cpu/sift.cpp                           | 1019 +------------------
 src/backend/cpu/sift_nonfree.hpp                   | 1033 ++++++++++++++++++++
 .../cuda/kernel/{sift.hpp => sift_nonfree.hpp}     |    0
 src/backend/cuda/sift.cu                           |    9 +-
 .../opencl/kernel/{sift.cl => sift_nonfree.cl}     |    0
 .../opencl/kernel/{sift.hpp => sift_nonfree.hpp}   |    4 +-
 src/backend/opencl/sift.cpp                        |   19 +-
 test/CMakeLists.txt                                |    2 +-
 test/{sift.cpp => sift_nonfree.cpp}                |    4 +-
 11 files changed, 1093 insertions(+), 1023 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git