[arrayfire] 332/408: Merge pull request #964 from pavanky/fixes_310

[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 c071d866da94672d74fa4a8ba53cba0a41bb0500
Merge: 8bb6ad7 f34693e
Author: Umar Arshad <umar at arrayfire.com>
Date:   Mon Aug 24 11:00:39 2015 -0400

    Merge pull request #964 from pavanky/fixes_310
    
    Updating documentation, version guards and bug 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/platform.cpp |  7 +++++-
 test/dog.cpp                    |  1 +
 21 files changed, 231 insertions(+), 75 deletions(-)

diff --cc include/af/vision.h
index a94401a,76e77fa..5449856
--- a/include/af/vision.h
+++ b/include/af/vision.h
@@@ -40,8 -41,9 +41,9 @@@ class array
   */
  AFAPI features fast(const array& in, const float thr=20.0f, const unsigned arc_length=9, const bool non_max=true, const float feature_ratio=0.05, const unsigned edge=3);
  
+ #if AF_API_VERSION >= 31
  /**
 -    C++ Interface for ORB feature descriptor
 +    C++ Interface for Harris corner detector
  
      \param[in] in array containing a grayscale image (color images are not
                 supported)
@@@ -256,8 -244,9 +277,9 @@@ extern "C" 
      */
      AFAPI af_err af_fast(af_features *out, const af_array in, const float thr, const unsigned arc_length, const bool non_max, const float feature_ratio, const unsigned edge);
  
+ #if AF_API_VERSION >= 31
      /**
 -        C Interface for Harris feature descriptor
 +        C Interface for Harris corner detector
  
          \param[out] out struct containing arrays for x and y
                      coordinates and score (Harris response), while arrays

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