fixed octave computation in SURF_GPU

used random images in gpu filter tests
2012-03-26 18:07:03 +00:00
parent 903c05db1a
commit 089a835c0a
7 changed files with 200 additions and 385 deletions
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -1516,13 +1516,14 @@ class CV_EXPORTS SURF_GPU
 public:
    enum KeypointLayout
    {
-        SF_X = 0,
-        SF_Y,
-        SF_LAPLACIAN,
-        SF_SIZE,
-        SF_DIR,
-        SF_HESSIAN,
-        SF_FEATURE_STRIDE
+        X_ROW = 0,
+        Y_ROW,
+        LAPLACIAN_ROW,
+        OCTAVE_ROW,
+        SIZE_ROW,
+        ANGLE_ROW,
+        HESSIAN_ROW,
+        ROWS_COUNT
    };

    //! the default constructor