[arrayfire] 15/79: Moved matchTemplate definition to vision.h

[Ghislain Vaillant]

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

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

commit a3cfd8133f9654e04fe4933d0ab97bb9baac9d3e
Author: Peter Andreas Entschev <peter at arrayfire.com>
Date:   Thu Jun 4 15:52:31 2015 -0400

    Moved matchTemplate definition to vision.h
---
 include/af/image.h  | 36 ------------------------------------
 include/af/vision.h | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/include/af/image.h b/include/af/image.h
index ce8cfea..67f5fc3 100644
--- a/include/af/image.h
+++ b/include/af/image.h
@@ -336,23 +336,6 @@ AFAPI array erode3(const array& in, const array& mask);
 AFAPI array regions(const array& in, const af::connectivity connectivity=AF_CONNECTIVITY_4, const dtype type=f32);
 
 /**
-   C++ Interface for image template matching
-
-   \param[in]  searchImg is an array with image data
-   \param[in]  templateImg is the template we are looking for in the image
-   \param[in]  mType is metric that should be used to calculate the disparity
-               between window in the image and the template image. It can be one of
-               the values defined by the enum \ref af_match_type
-   \return     array with disparity values for the window starting at
-               corresponding pixel position
-
-   \note If \p search_img is 3d array, a batch operation will be performed.
-
-   \ingroup cv_func_match_template
- */
-AFAPI array matchTemplate(const array &searchImg, const array &templateImg, const matchType mType=AF_SAD);
-
-/**
    C++ Interface for extracting sobel gradients
 
    \param[out] dx is derivative along horizontal direction
@@ -792,25 +775,6 @@ extern "C" {
     AFAPI af_err af_regions(af_array *out, const af_array in, const af_connectivity connectivity, const af_dtype ty);
 
     /**
-       C Interface for image template matching
-
-       \param[out] out will have disparity values for the window starting at
-                   corresponding pixel position
-       \param[in]  search_img is an array with image data
-       \param[in]  template_img is the template we are looking for in the image
-       \param[in]  m_type is metric that should be used to calculate the disparity
-                   between window in the image and the template image. It can be one of
-                   the values defined by the enum \ref af_match_type
-       \return     \ref AF_SUCCESS if disparity metric is computed successfully,
-       otherwise an appropriate error code is returned.
-
-       \note If \p search_img is 3d array, a batch operation will be performed.
-
-       \ingroup cv_func_match_template
-    */
-    AFAPI af_err af_match_template(af_array *out, const af_array search_img, const af_array template_img, const af_match_type m_type);
-
-    /**
        C Interface for getting sobel gradients
 
        \param[out] dx is derivative along horizontal direction
diff --git a/include/af/vision.h b/include/af/vision.h
index dd8beac..ed5e05f 100644
--- a/include/af/vision.h
+++ b/include/af/vision.h
@@ -90,6 +90,23 @@ AFAPI void hammingMatcher(array& idx, array& dist,
                           const array& query, const array& train,
                           const dim_t dist_dim=0, const unsigned n_dist=1);
 
+/**
+   C++ Interface for image template matching
+
+   \param[in]  searchImg is an array with image data
+   \param[in]  templateImg is the template we are looking for in the image
+   \param[in]  mType is metric that should be used to calculate the disparity
+               between window in the image and the template image. It can be one of
+               the values defined by the enum \ref af_match_type
+   \return     array with disparity values for the window starting at
+               corresponding pixel position
+
+   \note If \p search_img is 3d array, a batch operation will be performed.
+
+   \ingroup cv_func_match_template
+ */
+AFAPI array matchTemplate(const array &searchImg, const array &templateImg, const matchType mType=AF_SAD);
+
 }
 #endif
 
@@ -173,6 +190,25 @@ extern "C" {
                                     const af_array query, const af_array train,
                                     const dim_t dist_dim, const unsigned n_dist);
 
+    /**
+       C Interface for image template matching
+
+       \param[out] out will have disparity values for the window starting at
+                   corresponding pixel position
+       \param[in]  search_img is an array with image data
+       \param[in]  template_img is the template we are looking for in the image
+       \param[in]  m_type is metric that should be used to calculate the disparity
+                   between window in the image and the template image. It can be one of
+                   the values defined by the enum \ref af_match_type
+       \return     \ref AF_SUCCESS if disparity metric is computed successfully,
+       otherwise an appropriate error code is returned.
+
+       \note If \p search_img is 3d array, a batch operation will be performed.
+
+       \ingroup cv_func_match_template
+    */
+    AFAPI af_err af_match_template(af_array *out, const af_array search_img, const af_array template_img, const af_match_type m_type);
+
 #ifdef __cplusplus
 }
 #endif

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