kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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.

Browse Source
This commit is contained in:
Antony Riakiotakis 2011-11-29 20:06:36 +00:00
parent ba9fac0192
commit d4bd7dcd02
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/libmv/libmv/tracking/esm_region_tracker.cc vendored
View File

@ -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;

2
extern/libmv/libmv/tracking/klt_region_tracker.cc vendored
View File

@ -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.

6
extern/libmv/libmv/tracking/lmicklt_region_tracker.cc vendored
View File

@ -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;

2
extern/libmv/libmv/tracking/trklt_region_tracker.cc vendored
View File

@ -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.