Merging r42413 through r42441 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Dec 2011 18:53:09 +0000 (18:53 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Dec 2011 18:53:09 +0000 (18:53 +0000)
1  2 
extern/libmv/libmv-capi.cpp
extern/libmv/libmv/tracking/brute_region_tracker.cc
source/blender/blenkernel/intern/tracking.c

index e83a826e640d793132555c1937442717b2cf918c,dd98d0828dcc2dcd1e66937830e1afe4c665a9e2..1835c53b53f78acc1cb168dc0421712e7d018f71
@@@ -131,10 -130,9 +131,10 @@@ libmv_RegionTracker *libmv_hybridRegion
        esm_region_tracker->half_window_size = half_window_size;
        esm_region_tracker->max_iterations = max_iterations;
        esm_region_tracker->min_determinant = 1e-4;
 +      esm_region_tracker->minimum_correlation = minimum_correlation;
  
        libmv::BruteRegionTracker *brute_region_tracker = new libmv::BruteRegionTracker;
-   brute_region_tracker->half_window_size = half_window_size;
+       brute_region_tracker->half_window_size = half_window_size;
  
        libmv::HybridRegionTracker *hybrid_region_tracker =
                new libmv::HybridRegionTracker(brute_region_tracker, esm_region_tracker);
index 29b0fc5ff38af972664b5a935990f5434a165393,a416710ad2bae9cccd0bdbfe92323768dfb17fb4..2c7f613ee4a6b2bf7deccc24ee541003c8424117
  #include <emmintrin.h>
  #endif
  
- #ifndef __APPLE__
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
  // Needed for memalign on Linux and _aligned_alloc on Windows.
 -#ifdef FREE_WINDOWS
 -/* make sure _aligned_malloc is included */
 -#ifdef __MSVCRT_VERSION__
 -#undef __MSVCRT_VERSION__
 -#endif
 -
 -#define __MSVCRT_VERSION__ 0x0700
 -#endif
 -
  #include <malloc.h>
  #else
  // Apple's malloc is 16-byte aligned, and does not have malloc.h, so include