[arrayfire] 333/408: Merge branch 'devel' into 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 7fb28f6911ba634b971f841d848cab7b3558faa2
Merge: b9fac73 c071d86
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Aug 24 11:38:29 2015 -0400

    Merge branch 'devel' into nonfree_fixes

 CMakeModules/Version.cmake                         |   2 +-
 CMakeModules/version.h.in                          |   2 +-
 docs/details/image.dox                             |  11 -
 docs/details/vision.dox                            |  13 ++
 include/af/algorithm.h                             |  17 +-
 include/af/arith.h                                 |   5 +-
 include/af/array.h                                 |  42 ++--
 include/af/cuda.h                                  |   8 +
 include/af/data.h                                  |  23 +-
 include/af/defines.h                               |   5 +
 include/af/device.h                                |   4 +
 include/af/graphics.h                              |   2 +
 include/af/image.h                                 |  48 ++---
 include/af/index.h                                 |   4 +-
 include/af/signal.h                                |  40 ++++
 include/af/util.h                                  |  24 +++
 include/af/vision.h                                |  45 +++-
 src/api/c/dog.cpp                                  |   1 +
 src/api/cpp/dog.cpp                                |   2 +-
 src/backend/opencl/CMakeLists.txt                  |   6 +-
 src/backend/opencl/convolve_separable.cpp          |   4 +-
 src/backend/opencl/kernel/convolve/conv2_impl.hpp  | 117 ++++------
 src/backend/opencl/kernel/convolve_separable.cpp   | 122 +++++------
 src/backend/opencl/kernel/convolve_separable.hpp   |   7 +-
 src/backend/opencl/kernel/fast.hpp                 |  98 +++------
 src/backend/opencl/kernel/harris.hpp               |  47 +----
 src/backend/opencl/kernel/ireduce.hpp              | 177 ++++++++--------
 src/backend/opencl/kernel/nearest_neighbour.hpp    |  55 +++--
 src/backend/opencl/kernel/orb.hpp                  |   8 +-
 src/backend/opencl/kernel/reduce.hpp               | 235 ++++++++++-----------
 src/backend/opencl/kernel/scan_dim.hpp             | 207 ++++++++----------
 src/backend/opencl/kernel/scan_first.hpp           | 196 ++++++++---------
 src/backend/opencl/kernel/sift_nonfree.hpp         |  11 +-
 src/backend/opencl/kernel/where.hpp                |   7 +-
 src/backend/opencl/nearest_neighbour.cpp           |  54 +----
 src/backend/opencl/platform.cpp                    |   7 +-
 src/backend/opencl/scan.cpp                        |  12 +-
 .../backend/opencl/sort_by_key/b8.cpp              |  14 +-
 .../backend/opencl/sort_by_key/f32.cpp             |  14 +-
 .../backend/opencl/sort_by_key/f64.cpp             |  14 +-
 .../{sort_by_key.cpp => sort_by_key/impl.hpp}      |  34 ++-
 .../backend/opencl/sort_by_key/s32.cpp             |  14 +-
 .../backend/opencl/sort_by_key/u32.cpp             |  14 +-
 .../backend/opencl/sort_by_key/u8.cpp              |  14 +-
 test/dog.cpp                                       |   1 +
 45 files changed, 850 insertions(+), 937 deletions(-)


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