diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2011-11-30 00:06:36 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2011-11-30 00:06:36 +0400 |
commit | d4bd7dcd02bd1a5b1a0225ce4481fde5a238aa46 (patch) | |
tree | 19b9c912f0b10e212ded8bc0f344dee7d6a65cd2 /extern | |
parent | ba9fac019237918d8066a54bf8de160b211fcc97 (diff) |
Fix link errors for MinGW debug for blenderplayer. This bizarre error, not present in release builds, happens due to name clashes between tracker functions. static-fied them so the linker stops complaining.
Diffstat (limited to 'extern')
4 files changed, 8 insertions, 8 deletions
diff --git a/extern/libmv/libmv/tracking/esm_region_tracker.cc b/extern/libmv/libmv/tracking/esm_region_tracker.cc index 01edee3bbb5..844b5ff3cb9 100644 --- a/extern/libmv/libmv/tracking/esm_region_tracker.cc +++ b/extern/libmv/libmv/tracking/esm_region_tracker.cc @@ -31,7 +31,7 @@ namespace libmv { // TODO(keir): Reduce duplication between here and the other region trackers. -bool RegionIsInBounds(const FloatImage &image1, +static bool RegionIsInBounds(const FloatImage &image1, double x, double y, int half_window_size) { // Check the minimum coordinates. @@ -56,7 +56,7 @@ bool RegionIsInBounds(const FloatImage &image1, // Sample a region centered at x,y in image with size extending by half_width // from x,y. Channels specifies the number of channels to sample from. -void SamplePattern(const FloatImage &image, +static void SamplePattern(const FloatImage &image, double x, double y, int half_width, int channels, @@ -74,7 +74,7 @@ void SamplePattern(const FloatImage &image, // Estimate "reasonable" error by computing autocorrelation for a small shift. // TODO(keir): Add a facility for -double EstimateReasonableError(const FloatImage &image, +static double EstimateReasonableError(const FloatImage &image, double x, double y, int half_width) { double error = 0.0; diff --git a/extern/libmv/libmv/tracking/klt_region_tracker.cc b/extern/libmv/libmv/tracking/klt_region_tracker.cc index 78ce0be603c..c8e605de572 100644 --- a/extern/libmv/libmv/tracking/klt_region_tracker.cc +++ b/extern/libmv/libmv/tracking/klt_region_tracker.cc @@ -63,7 +63,7 @@ static void ComputeTrackingEquation(const Array3Df &image_and_gradient1, } } -bool RegionIsInBounds(const FloatImage &image1, +static bool RegionIsInBounds(const FloatImage &image1, double x, double y, int half_window_size) { // Check the minimum coordinates. diff --git a/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc b/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc index 5ac96e66175..c06a1d3302c 100644 --- a/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc +++ b/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc @@ -29,7 +29,7 @@ namespace libmv { // TODO(keir): Reduce duplication between here and the other region trackers. -bool RegionIsInBounds(const FloatImage &image1, +static bool RegionIsInBounds(const FloatImage &image1, double x, double y, int half_window_size) { // Check the minimum coordinates. @@ -54,7 +54,7 @@ bool RegionIsInBounds(const FloatImage &image1, // Sample a region centered at x,y in image with size extending by half_width // from x,y. Channels specifies the number of channels to sample from. -void SamplePattern(const FloatImage &image, +static void SamplePattern(const FloatImage &image, double x, double y, int half_width, int channels, @@ -71,7 +71,7 @@ void SamplePattern(const FloatImage &image, } // Estimate "reasonable" error by computing autocorrelation for a small shift. -double EstimateReasonableError(const FloatImage &image, +static double EstimateReasonableError(const FloatImage &image, double x, double y, int half_width) { double error = 0.0; diff --git a/extern/libmv/libmv/tracking/trklt_region_tracker.cc b/extern/libmv/libmv/tracking/trklt_region_tracker.cc index 7e51787ebac..f19315b6b11 100644 --- a/extern/libmv/libmv/tracking/trklt_region_tracker.cc +++ b/extern/libmv/libmv/tracking/trklt_region_tracker.cc @@ -81,7 +81,7 @@ static void ComputeTrackingEquation(const Array3Df &image_and_gradient1, *e = (A + lambda*Mat2f::Identity())*Di*(V - W) + 0.5*(S - R); } -bool RegionIsInBounds(const FloatImage &image1, +static bool RegionIsInBounds(const FloatImage &image1, double x, double y, int half_window_size) { // Check the minimum coordinates. |