[arrayfire] 210/248: Fixed homography documentation
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:28 UTC 2015
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 c55cae4f68551889fdbd2889e786735de7ecfd04
Author: Peter Andreas Entschev <peter at arrayfire.com>
Date: Fri Nov 6 11:37:56 2015 -0500
Fixed homography documentation
---
include/af/vision.h | 21 ++++++++++-----------
src/api/c/homography.cpp | 6 +++---
src/api/cpp/homography.cpp | 4 ++--
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/include/af/vision.h b/include/af/vision.h
index ef96f51..78cc107 100644
--- a/include/af/vision.h
+++ b/include/af/vision.h
@@ -306,22 +306,22 @@ AFAPI array dog(const array& in, const int radius1, const int radius2);
\param[in] y_src y coordinates of the source points.
\param[in] x_dst x coordinates of the destination points.
\param[in] y_dst y coordinates of the destination points.
+ \param[in] htype can be AF_HOMOGRAPHY_RANSAC, for which a RANdom SAmple Consensus will be
+ used to evaluate the homography quality (e.g., number of inliers), or AF_HOMOGRAPHY_LMEDS,
+ which will use Least Median of Squares method to evaluate homography quality
\param[in] inlier_thr if htype is AF_HOMOGRAPHY_RANSAC, this parameter will five the maximum L2-distance
for a point to be considered an inlier.
\param[in] iterations maximum number of iterations when htype is AF_HOMOGRAPHY_RANSAC and backend is CPU,
if backend is CUDA or OpenCL, iterations is the total number of iterations, an
iteration is a selection of 4 random points for which the homography is estimated
and evaluated for number of inliers.
- \param[in] af_homography_type can be AF_HOMOGRAPHY_RANSAC, for which a RANdom SAmple Consensus will be
- used to evaluate the homography quality (e.g., number of inliers), or AF_HOMOGRAPHY_LMEDS,
- which will use Least Median of Squares method to evaluate homography quality
- \param[in] dtype the array type for the homography output.
+ \param[in] otype the array type for the homography output.
\ingroup cv_func_homography
*/
AFAPI void homography(array& H, int& inliers, const array& x_src, const array& y_src,
const array& x_dst, const array& y_dst, const af_homography_type htype=AF_HOMOGRAPHY_RANSAC,
- const float inlier_thr=3.f, const unsigned iterations=1000, const dtype type=f32);
+ const float inlier_thr=3.f, const unsigned iterations=1000, const dtype otype=f32);
#endif
}
@@ -622,17 +622,16 @@ extern "C" {
\param[in] y_src y coordinates of the source points.
\param[in] x_dst x coordinates of the destination points.
\param[in] y_dst y coordinates of the destination points.
+ \param[in] htype can be AF_HOMOGRAPHY_RANSAC, for which a RANdom SAmple Consensus will be
+ used to evaluate the homography quality (e.g., number of inliers), or AF_HOMOGRAPHY_LMEDS,
+ which will use Least Median of Squares method to evaluate homography quality.
\param[in] inlier_thr if htype is AF_HOMOGRAPHY_RANSAC, this parameter will five the maximum L2-distance
for a point to be considered an inlier.
\param[in] iterations maximum number of iterations when htype is AF_HOMOGRAPHY_RANSAC and backend is CPU,
if backend is CUDA or OpenCL, iterations is the total number of iterations, an
iteration is a selection of 4 random points for which the homography is estimated
and evaluated for number of inliers.
- \param[in] af_homography_type can be AF_HOMOGRAPHY_RANSAC, for which a RANdom SAmple Consensus will be
- used to evaluate the homography quality (e.g., number of inliers), or AF_HOMOGRAPHY_LMEDS,
- which will use Least Median of Squares method to evaluate homography quality.
- \param[in] dtype the array type for the homography output.
- \param[out] out is difference of smoothed inputs.
+ \param[in] otype the array type for the homography output.
\return \ref AF_SUCCESS if the computation is is successful,
otherwise an appropriate error code is returned.
@@ -641,7 +640,7 @@ extern "C" {
AFAPI 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);
+ const unsigned iterations, const af_dtype otype);
#endif
#ifdef __cplusplus
diff --git a/src/api/c/homography.cpp b/src/api/c/homography.cpp
index f853ade..c8fc9bd 100644
--- a/src/api/c/homography.cpp
+++ b/src/api/c/homography.cpp
@@ -40,7 +40,7 @@ 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)
+ const unsigned iterations, const af_dtype otype)
{
try {
ArrayInfo xsinfo = getInfo(x_src);
@@ -74,10 +74,10 @@ af_err af_homography(af_array *H, int *inliers,
af_array outH;
int outInl;
- switch(type) {
+ switch(otype) {
case f32: homography<float >(outH, outInl, x_src, y_src, x_dst, y_dst, htype, inlier_thr, iterations); break;
case f64: homography<double>(outH, outInl, x_src, y_src, x_dst, y_dst, htype, inlier_thr, iterations); break;
- default: TYPE_ERROR(1, type);
+ default: TYPE_ERROR(1, otype);
}
std::swap(*H, outH);
std::swap(*inliers, outInl);
diff --git a/src/api/cpp/homography.cpp b/src/api/cpp/homography.cpp
index ed49b1d..7779104 100644
--- a/src/api/cpp/homography.cpp
+++ b/src/api/cpp/homography.cpp
@@ -18,13 +18,13 @@ void homography(array &H, int &inliers,
const array &x_src, const array &y_src,
const array &x_dst, const array &y_dst,
const af_homography_type htype, const float inlier_thr,
- const unsigned iterations, const af::dtype type)
+ const unsigned iterations, const af::dtype otype)
{
af_array outH;
AF_THROW(af_homography(&outH, &inliers,
x_src.get(), y_src.get(),
x_dst.get(), y_dst.get(),
- htype, inlier_thr, iterations, type));
+ htype, inlier_thr, iterations, otype));
H = array(outH);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list