[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40583] branches/soc-2011-tomato/extern/ libmv: Camera tracking integration

[Sergey Sharybin]

Revision: 40583
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40583
Author:   nazgul
Date:     2011-09-26 20:03:07 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

Attempt to fix MinGW compilaiton.

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/libmv/numeric/numeric.h
    branches/soc-2011-tomato/extern/libmv/patches/series

Added Paths:
-----------
    branches/soc-2011-tomato/extern/libmv/patches/mingw.patch

Modified: branches/soc-2011-tomato/extern/libmv/libmv/numeric/numeric.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/numeric/numeric.h	2011-09-26 19:00:12 UTC (rev 40582)
+++ branches/soc-2011-tomato/extern/libmv/libmv/numeric/numeric.h	2011-09-26 20:03:07 UTC (rev 40583)
@@ -40,7 +40,7 @@
   }
 #endif //_WIN32 || __APPLE__
 
-#if _WIN32
+#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__)
   inline long lround(double d) {
     return (long)(d>0 ? d+0.5 : ceil(d-0.5));
   }

Added: branches/soc-2011-tomato/extern/libmv/patches/mingw.patch
===================================================================
--- branches/soc-2011-tomato/extern/libmv/patches/mingw.patch	                        (rev 0)
+++ branches/soc-2011-tomato/extern/libmv/patches/mingw.patch	2011-09-26 20:03:07 UTC (rev 40583)
@@ -0,0 +1,13 @@
+diff --git a/src/libmv/numeric/numeric.h b/src/libmv/numeric/numeric.h
+index f39d126..21e0f06 100644
+--- a/src/libmv/numeric/numeric.h
++++ b/src/libmv/numeric/numeric.h
+@@ -40,7 +40,7 @@
+   }
+ #endif //_WIN32 || __APPLE__
+ 
+-#if _WIN32
++#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__)
+   inline long lround(double d) {
+     return (long)(d>0 ? d+0.5 : ceil(d-0.5));
+   }

Modified: branches/soc-2011-tomato/extern/libmv/patches/series
===================================================================
--- branches/soc-2011-tomato/extern/libmv/patches/series	2011-09-26 19:00:12 UTC (rev 40582)
+++ branches/soc-2011-tomato/extern/libmv/patches/series	2011-09-26 20:03:07 UTC (rev 40583)
@@ -6,3 +6,4 @@
 levenberg_marquardt.patch
 function_derivative.patch
 high_distortion_crash_fix.patch
+mingw.patch