diff options
Diffstat (limited to 'intern/libmv/libmv/tracking/track_region.h')
-rw-r--r-- | intern/libmv/libmv/tracking/track_region.h | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/intern/libmv/libmv/tracking/track_region.h b/intern/libmv/libmv/tracking/track_region.h index 61dce22bcb8..7868e3b8b77 100644 --- a/intern/libmv/libmv/tracking/track_region.h +++ b/intern/libmv/libmv/tracking/track_region.h @@ -19,6 +19,7 @@ // IN THE SOFTWARE. #ifndef LIBMV_TRACKING_TRACK_REGION_H_ +#define LIBMV_TRACKING_TRACK_REGION_H_ #include "libmv/image/image.h" #include "libmv/image/sample.h" @@ -107,7 +108,7 @@ struct TrackRegionOptions { // If non-null, this is used as the pattern mask. It should match the size of // image1, even though only values inside the image1 quad are examined. The // values must be in the range 0.0 to 0.1. - FloatImage *image1_mask; + FloatImage* image1_mask; }; struct TrackRegionResult { @@ -128,8 +129,7 @@ struct TrackRegionResult { Termination termination; bool is_usable() { - return termination == CONVERGENCE || - termination == NO_CONVERGENCE; + return termination == CONVERGENCE || termination == NO_CONVERGENCE; } int num_iterations; @@ -140,12 +140,14 @@ struct TrackRegionResult { }; // Always needs 4 correspondences. -void TrackRegion(const FloatImage &image1, - const FloatImage &image2, - const double *x1, const double *y1, - const TrackRegionOptions &options, - double *x2, double *y2, - TrackRegionResult *result); +void TrackRegion(const FloatImage& image1, + const FloatImage& image2, + const double* x1, + const double* y1, + const TrackRegionOptions& options, + double* x2, + double* y2, + TrackRegionResult* result); // Sample a "canonical" version of the passed planar patch, using bilinear // sampling. The passed corners must be within the image, and have at least two @@ -156,11 +158,15 @@ void TrackRegion(const FloatImage &image1, // the size of image. // Warped coordinates of marker's position would be returned in // warped_position_x and warped_position_y -bool SamplePlanarPatch(const FloatImage &image, - const double *xs, const double *ys, - int num_samples_x, int num_samples_y, - FloatImage *mask, FloatImage *patch, - double *warped_position_x, double *warped_position_y); +bool SamplePlanarPatch(const FloatImage& image, + const double* xs, + const double* ys, + int num_samples_x, + int num_samples_y, + FloatImage* mask, + FloatImage* patch, + double* warped_position_x, + double* warped_position_y); } // namespace libmv |