diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-25 19:32:23 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-25 19:32:23 +0400 |
| commit | aff993db555dce2d45462856320ab640b7dab429 (patch) | |
| tree | 081ef9318985a49301749b01ceadbec484b991f3 /extern | |
| parent | e22884966656e19339b509024894f674e0ee3afb (diff) | |
| parent | 951c1798ab54b32d3be204a0ae48144dc116f536 (diff) | |
Merging r42062 through r42159 from trunk into soc-2011-tomato
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/SConscript | 12 | ||||
| -rw-r--r-- | extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index 60705e913f7..9c134934fa0 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -46,16 +46,16 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): defs.append('NDEBUG') else: if not env['BF_DEBUG']: - cflags_libmv = Split(env['REL_CFLAGS']) - ccflags_libmv = Split(env['REL_CCFLAGS']) - cxxflags_libmv = Split(env['REL_CXXFLAGS']) + cflags_libmv += Split(env['REL_CFLAGS']) + ccflags_libmv += Split(env['REL_CCFLAGS']) + cxxflags_libmv += Split(env['REL_CXXFLAGS']) else: src += env.Glob("third_party/glog/src/*.cc") incs += ' ./third_party/glog/src' if not env['BF_DEBUG']: - cflags_libmv = Split(env['REL_CFLAGS']) - ccflags_libmv = Split(env['REL_CCFLAGS']) - cxxflags_libmv = Split(env['REL_CXXFLAGS']) + cflags_libmv += Split(env['REL_CFLAGS']) + ccflags_libmv += Split(env['REL_CCFLAGS']) + cxxflags_libmv += Split(env['REL_CXXFLAGS']) incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc index ba88ce7676d..ab9b21d6dfd 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc +++ b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc @@ -201,6 +201,8 @@ void CameraIntrinsics::ComputeLookupGrid(Grid* grid, int width, int height, doub warp_y = warp_y*aspy + 0.5 * overscan * h; int ix = int(warp_x), iy = int(warp_y); int fx = round((warp_x-ix)*256), fy = round((warp_y-iy)*256); + if(fx == 256) { fx=0; ix++; } + if(fy == 256) { fy=0; iy++; } // Use nearest border pixel if( ix < 0 ) { ix = 0, fx = 0; } if( iy < 0 ) { iy = 0, fy = 0; } |