Commit 73bed6f3 authored by cbalint13's avatar cbalint13

Rebase the code, massive cleanups. We still pass QA.

parent 2d85137e
......@@ -196,7 +196,7 @@ public:
/**
* @param y position y on image
* @param x position x on image
* @param ori orientation on image (0->360)
* @param orientation orientation on image (0->360)
* @param descriptor supplied array for descriptor storage
*/
virtual void get_descriptor( double y, double x, int orientation, float* descriptor ) const = 0;
......@@ -204,7 +204,7 @@ public:
/**
* @param y position y on image
* @param x position x on image
* @param ori orientation on image (0->360)
* @param orientation orientation on image (0->360)
* @param H homography matrix for warped grid
* @param descriptor supplied array for descriptor storage
* @param get_descriptor true if descriptor was computed
......@@ -214,7 +214,7 @@ public:
/**
* @param y position y on image
* @param x position x on image
* @param ori orientation on image (0->360)
* @param orientation orientation on image (0->360)
* @param descriptor supplied array for descriptor storage
*/
virtual void get_unnormalized_descriptor( double y, double x, int orientation, float* descriptor ) const = 0;
......@@ -222,18 +222,13 @@ public:
/**
* @param y position y on image
* @param x position x on image
* @param ori orientation on image (0->360)
* @param orientation orientation on image (0->360)
* @param H homography matrix for warped grid
* @param descriptor supplied array for descriptor storage
* @param get_unnormalized_descriptor true if descriptor was computed
*/
virtual bool get_unnormalized_descriptor( double y, double x, int orientation, double* H, float* descriptor ) const = 0;
/**
* @param image set image as working
*/
virtual void set_image( InputArray image ) = 0;
};
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment