diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-19 19:17:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-19 19:17:26 +0400 |
| commit | 78a208641500a1c7c585ccca34df20b9185869e5 (patch) | |
| tree | 5de0449c7c1c295afac1a8e2569ddb00e3fba668 /extern | |
| parent | c15012e568c6416d79bc28afd5f82a7a29a25743 (diff) | |
Camera tracking integration
===========================
Previous fix wasn't checked and it was typo there.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/ChangeLog | 6 | ||||
| -rw-r--r-- | extern/libmv/libmv/tracking/sad.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog index a99027d3b65..df76a89d29d 100644 --- a/extern/libmv/ChangeLog +++ b/extern/libmv/ChangeLog @@ -1,3 +1,9 @@ +commit a14eb3953c9521b2e08ff9ddd45b33ff1f8aeafb +Author: Matthias Fauconneau <matthias.fauconneau@gmail.com> +Date: Fri Aug 19 17:12:12 2011 +0200 + + Update marker preview to new affine tracking. + commit 5299ea67043459eda147950e589c2d327a8fbced Author: Matthias Fauconneau <matthias.fauconneau@gmail.com> Date: Fri Aug 19 16:05:54 2011 +0200 diff --git a/extern/libmv/libmv/tracking/sad.cc b/extern/libmv/libmv/tracking/sad.cc index d84233f7b53..cec2822ba6b 100644 --- a/extern/libmv/libmv/tracking/sad.cc +++ b/extern/libmv/libmv/tracking/sad.cc @@ -122,7 +122,7 @@ float Track(ubyte* reference, ubyte* warped, int size, ubyte* image, int stride, min=-1; //reset score since direct warped search match too well (but the wrong pattern). // 6D coordinate descent to find affine transform - ubyte match = new ubyte[size*size]; + ubyte* match = new ubyte[size*size]; float step = 0.5; for(int p = 0; p < 8; p++) { //foreach precision level for(int i = 0; i < 2; i++) { // iterate twice per precision level |