[Bf-blender-cvs] [c4a9ec8] master: Fix crash when enabling undistorted display in MCE

[Sergey Sharybin]

Commit: c4a9ec88c8c7823f5a25aa28d21b4dc5c7d946ef
Author: Sergey Sharybin
Date:   Thu Apr 17 18:01:45 2014 +0600
https://developer.blender.org/rBc4a9ec88c8c7823f5a25aa28d21b4dc5c7d946ef

Fix crash when enabling undistorted display in MCE

===================================================================

M	extern/libmv/ChangeLog
M	extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h

===================================================================

diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog
index af18b02..12891d0 100644
--- a/extern/libmv/ChangeLog
+++ b/extern/libmv/ChangeLog
@@ -1,3 +1,13 @@
+commit e1fe41b6604771ba769a9b15eb2f489fbf7af251
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Apr 17 17:52:23 2014 +0600
+
+    Fix offset array not being properly allocated
+    
+    We really do need unit test for buffer (un)distortion,
+    didn't notice this bug for until new Libmv has been
+    integrated into Blender.
+
 commit ee21415a353396df67ef21e82adaffab2a8d2a0a
 Author: Sergey Sharybin <sergey.vfx at gmail.com>
 Date:   Thu Apr 17 16:26:12 2014 +0600
@@ -660,17 +670,3 @@ Author: Sergey Sharybin <sergey.vfx at gmail.com>
 Date:   Mon May 13 04:22:05 2013 +0600
 
     Minor code style cleanup.
-
-commit ad3dbaaef10ea721230694311a359df152c7a44a
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Sun May 12 22:34:54 2013 +0600
-
-    Cleanup in simple pipeline's bundler
-    
-    - Better match Google's code style conventions.
-    - Move evaluation part into own function, makes
-      bundling itself easier to follow.
-    - Made evaluation an optional parameter.
-    - Removed note about unsupported camera intrinsics
-      refining flags. Technically, all combinations
-      are possible.
diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h b/extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h
index 66264bd..97abee7 100644
--- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h
+++ b/extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h
@@ -105,7 +105,7 @@ void LookupWarpGrid::Update(const CameraIntrinsics &intrinsics,
   }
 
   if (offset_ == NULL) {
-    offset_ = new Offset[width_ * height_];
+    offset_ = new Offset[width * height];
     Compute<WarpFunction>(intrinsics,
                           width,
                           height,