diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-30 21:27:59 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-30 21:29:24 +0300 |
commit | 489f22445d85e0212349659dd2a521ee010d3c99 (patch) | |
tree | fc1a66f2aab9b857a608ce79e6aa4332cd59f707 | |
parent | 2939132d90008cd0891952906f895cef3c8186f1 (diff) |
Libmv: Fix for famous Image(x,y,z) vs. Image(y,x,z)libmv_prediction
-rw-r--r-- | extern/libmv/intern/frame_accessor.cc | 2 | ||||
-rw-r--r-- | extern/libmv/libmv/autotrack/autotrack.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extern/libmv/intern/frame_accessor.cc b/extern/libmv/intern/frame_accessor.cc index a7d969af05b..8bf2cab914b 100644 --- a/extern/libmv/intern/frame_accessor.cc +++ b/extern/libmv/intern/frame_accessor.cc @@ -147,8 +147,8 @@ void libmv_frameAccessorgetTransformRun(const libmv_FrameTransform *transform, const libmv_FloatImage *input_image, libmv_FloatImage *output_image) { const FloatImage input(input_image->buffer, - input_image->width, input_image->height, + input_image->width, input_image->channels); FloatImage output; diff --git a/extern/libmv/libmv/autotrack/autotrack.cc b/extern/libmv/libmv/autotrack/autotrack.cc index b5d0ad45a8e..96a0ef64a50 100644 --- a/extern/libmv/libmv/autotrack/autotrack.cc +++ b/extern/libmv/libmv/autotrack/autotrack.cc @@ -57,13 +57,13 @@ class DisableChannelsTransform : public FrameAccessor::Transform { (disable_green ? 0.0f : 0.7152f) + (disable_blue ? 0.0f : 0.0722f); - output->Resize(input.Width(), input.Height(), 1); + output->Resize(input.Height(), input.Width(), 1); for (int y = 0; y < input.Height(); y++) { for (int x = 0; x < input.Width(); x++) { - float r = disable_red ? 0.0f : input(x, y, 0); - float g = disable_green ? 0.0f : input(x, y, 1); - float b = disable_blue ? 0.0f : input(x, y, 2); - (*output)(x, y, 0) = (0.2126f * r + 0.7152f * g + 0.0722f * b) / scale; + float r = disable_red ? 0.0f : input(y, x, 0); + float g = disable_green ? 0.0f : input(y, x, 1); + float b = disable_blue ? 0.0f : input(y, x, 2); + (*output)(y, x, 0) = (0.2126f * r + 0.7152f * g + 0.0722f * b) / scale; } } } |