diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-17 16:01:45 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-17 16:01:45 +0400 |
| commit | c4a9ec88c8c7823f5a25aa28d21b4dc5c7d946ef (patch) | |
| tree | 12f60e61e01e65db359580e20a99728150474786 | |
| parent | ed2ddc9f706b956ea955ac86b3e7ec5e0b41d9cd (diff) | |
Fix crash when enabling undistorted display in MCE
| -rw-r--r-- | extern/libmv/ChangeLog | 24 | ||||
| -rw-r--r-- | extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h | 2 |
2 files changed, 11 insertions, 15 deletions
diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog index af18b02a4db..12891d03ff9 100644 --- a/extern/libmv/ChangeLog +++ b/extern/libmv/ChangeLog @@ -1,3 +1,13 @@ +commit e1fe41b6604771ba769a9b15eb2f489fbf7af251 +Author: Sergey Sharybin <sergey.vfx@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@gmail.com> Date: Thu Apr 17 16:26:12 2014 +0600 @@ -660,17 +670,3 @@ Author: Sergey Sharybin <sergey.vfx@gmail.com> Date: Mon May 13 04:22:05 2013 +0600 Minor code style cleanup. - -commit ad3dbaaef10ea721230694311a359df152c7a44a -Author: Sergey Sharybin <sergey.vfx@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 66264bdbd93..97abee7ab01 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, |