[arrayfire] 230/248: Merge branch 'homography' of https://github.com/pentschev/arrayfire into unified_checks

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 0d8f6477192584925943181b52b81f2e3869aa37
Merge: 144a2db c55cae4
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Tue Nov 10 17:46:01 2015 -0500

    Merge branch 'homography' of https://github.com/pentschev/arrayfire into unified_checks
    
    Conflicts:
    	include/af/defines.h

 docs/details/vision.dox                  |  24 ++
 include/af/defines.h                     |   7 +
 include/af/vision.h                      | 115 ++++-
 src/api/c/homography.cpp                 |  88 ++++
 src/api/cpp/homography.cpp               |  32 ++
 src/api/unified/vision.cpp               |   8 +
 src/backend/cpu/homography.cpp           | 383 +++++++++++++++++
 src/backend/cpu/homography.hpp           |  22 +
 src/backend/cuda/homography.cu           |  79 ++++
 src/backend/cuda/homography.hpp          |  22 +
 src/backend/cuda/kernel/homography.hpp   | 700 +++++++++++++++++++++++++++++++
 src/backend/opencl/homography.cpp        |  96 +++++
 src/backend/opencl/homography.hpp        |  22 +
 src/backend/opencl/kernel/homography.cl  | 517 +++++++++++++++++++++++
 src/backend/opencl/kernel/homography.hpp | 261 ++++++++++++
 test/data                                |   2 +-
 test/homography.cpp                      | 277 ++++++++++++
 17 files changed, 2642 insertions(+), 13 deletions(-)

diff --cc include/af/defines.h
index c549313,934d69a..a25d239
--- a/include/af/defines.h
+++ b/include/af/defines.h
@@@ -352,9 -324,12 +352,16 @@@ typedef enum 
      AF_FIF_JP2          = 31,   ///< FreeImage Enum for JPEG-2000 File
      AF_FIF_RAW          = 34    ///< FreeImage Enum for RAW Camera Image File
  } af_image_format;
 +#endif
  
 +#if AF_API_VERSION >= 32
+ typedef enum {
+     AF_HOMOGRAPHY_RANSAC = 0,   ///< Computes homography using RANSAC
+     AF_HOMOGRAPHY_LMEDS  = 1    ///< Computes homography using Least Median of Squares
+ } af_homography_type;
++#endif
+ 
++#if AF_API_VERSION >= 32
  // These enums should be 2^x
  typedef enum {
      AF_BACKEND_DEFAULT = 0,  ///< Default backend order: OpenCL -> CUDA -> CPU
diff --cc src/api/unified/vision.cpp
index 1f71740,8a3ab3c..cc43a61
--- a/src/api/unified/vision.cpp
+++ b/src/api/unified/vision.cpp
@@@ -73,6 -64,12 +73,14 @@@ af_err af_susan(af_features* out, cons
  
  af_err af_dog(af_array *out, const af_array in, const int radius1, const int radius2)
  {
 +    CHECK_ARRAYS(in);
      return CALL(out, in, radius1, radius2);
  }
+ 
+ af_err af_homography(af_array *H, int *inliers, const af_array x_src, const af_array y_src,
+                      const af_array x_dst, const af_array y_dst, const af_homography_type htype,
+                      const float inlier_thr, const unsigned iterations, const af_dtype type)
+ {
++    CHECK_ARRAYS(x_src, y_src, x_dst, y_dst);
+     return CALL(H, inliers, x_src, y_src, x_dst, y_dst, htype, inlier_thr, iterations, type);
+ }

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