[arrayfire] 167/408: fixes: typos; specific to windows; additional unit test

[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 220f027f24adf0a1f343722f5c95a1754a1f8d80
Author: pradeep <pradeep at arrayfire.com>
Date:   Fri Jul 24 16:08:01 2015 -0400

    fixes: typos; specific to windows; additional unit test
---
 examples/computer_vision/susan.cpp | 4 +---
 include/af/vision.h                | 4 ++--
 src/backend/opencl/susan.cpp       | 1 +
 test/data                          | 2 +-
 test/susan.cpp                     | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/computer_vision/susan.cpp b/examples/computer_vision/susan.cpp
index 3cafe71..858ed5f 100644
--- a/examples/computer_vision/susan.cpp
+++ b/examples/computer_vision/susan.cpp
@@ -28,9 +28,7 @@ static void susan_demo(bool console)
 
     features feat = susan(img, 3, 32.0f, 10, 0.05f, 3);
 
-    if (feat.getNumFeatures() > 0) {
-        printf("Found features, proceeding ahead\n");
-    } else {
+    if (!(feat.getNumFeatures() > 0)) {
         printf("No features found, exiting\n");
         return;
     }
diff --git a/include/af/vision.h b/include/af/vision.h
index de2b045..22decc1 100644
--- a/include/af/vision.h
+++ b/include/af/vision.h
@@ -171,7 +171,7 @@ AFAPI array matchTemplate(const array &searchImg, const array &templateImg, cons
    C++ Interface for SUSAN corner detector
 
    \param[in]  in is input grayscale/intensity image
-   \param[in]  radius Nuclei radius for each pixel neighborhood
+   \param[in]  radius nucleus radius for each pixel neighborhood
    \param[in]  diff_thr intensity difference threshold
    \param[in]  geom_thr geometric threshold a.k.a **t** from equations in description
    \param[in]  feature_ratio is maximum number of features that will be returned by the function
@@ -354,7 +354,7 @@ extern "C" {
        \param[out] out is af_features struct composed of arrays for x and y
                    coordinates, score, orientation and size of selected features
        \param[in]  in is input grayscale/intensity image
-       \param[in]  radius Nuclei radius for each pixel neighborhood
+       \param[in]  radius nucleus radius for each pixel neighborhood
        \param[in]  diff_thr intensity difference threshold a.k.a **t** from equations in description
        \param[in]  geom_thr geometric threshold
        \param[in]  feature_ratio is maximum number of features that will be returned by the function
diff --git a/src/backend/opencl/susan.cpp b/src/backend/opencl/susan.cpp
index 15308d9..7d2db5a 100644
--- a/src/backend/opencl/susan.cpp
+++ b/src/backend/opencl/susan.cpp
@@ -12,6 +12,7 @@
 #include <err_opencl.hpp>
 #include <kernel/susan.hpp>
 #include <cmath>
+#include <algorithm>
 #include <sort_index.hpp>
 
 using af::features;
diff --git a/test/data b/test/data
index 35de6d7..79b0784 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 35de6d78b7e46f6e3441dcceb81e96a968e940d3
+Subproject commit 79b0784a55044869ac32631560fae1e39aa53bbd
diff --git a/test/susan.cpp b/test/susan.cpp
index c7a22df..4e69953 100644
--- a/test/susan.cpp
+++ b/test/susan.cpp
@@ -77,7 +77,7 @@ void susanTest(string pTestFile, float t, float g)
 
         af::array in = af::loadImage(inFiles[testId].c_str(), false);
 
-        af::features out = af::susan(in, 3, 32, 10, 0.05f, 3);
+        af::features out = af::susan(in, 3, t, g, 0.05f, 3);
 
         float * outX           = new float[gold[0].size()];
         float * outY           = new float[gold[1].size()];
@@ -121,6 +121,7 @@ void susanTest(string pTestFile, float t, float g)
         susanTest<TypeParam>(string(TEST_DIR "/susan/"#image".test"), tval, gval);\
     }
 
+SUSAN_TEST(man_t32_g10, 32, 10);
 SUSAN_TEST(square_t32_g10, 32, 10);
 SUSAN_TEST(square_t32_g20, 32, 20);
 

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