[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42267] trunk/blender/extern/libmv/libmv/ tracking: Fix link errors for MinGW debug for blenderplayer.

[Antony Riakiotakis]

Revision: 42267
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42267
Author:   psy-fi
Date:     2011-11-29 20:06:36 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc

Modified: trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc	2011-11-29 19:50:34 UTC (rev 42266)
+++ trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc	2011-11-29 20:06:36 UTC (rev 42267)
@@ -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 @@
 
 // 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 @@
 
 // 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;

Modified: trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc	2011-11-29 19:50:34 UTC (rev 42266)
+++ trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc	2011-11-29 20:06:36 UTC (rev 42267)
@@ -63,7 +63,7 @@
   }
 }
 
-bool RegionIsInBounds(const FloatImage &image1,
+static bool RegionIsInBounds(const FloatImage &image1,
                       double x, double y,
                       int half_window_size) {
   // Check the minimum coordinates.

Modified: trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc	2011-11-29 19:50:34 UTC (rev 42266)
+++ trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc	2011-11-29 20:06:36 UTC (rev 42267)
@@ -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 @@
 
 // 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 @@
 }
 
 // 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;

Modified: trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc	2011-11-29 19:50:34 UTC (rev 42266)
+++ trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc	2011-11-29 20:06:36 UTC (rev 42267)
@@ -81,7 +81,7 @@
   *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.