forked from bartvdbraak/blender
Camera tracing integration
========================== Fix for SAD tracking sliding marker.
This commit is contained in:
parent
9d2caba92e
commit
a19b0d358a
3
extern/libmv/CMakeLists.txt
vendored
3
extern/libmv/CMakeLists.txt
vendored
@ -31,7 +31,8 @@ set(INC
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
|
||||
${PNG_INCLUDE_DIR}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
2
extern/libmv/SConscript
vendored
2
extern/libmv/SConscript
vendored
@ -26,6 +26,8 @@ src += env.Glob('third_party/ssba/Geometry/*.cpp')
|
||||
src += env.Glob('third_party/ssba/Math/*.cpp')
|
||||
|
||||
incs = '. ../Eigen3'
|
||||
incs += ' ' + env['BF_PNG_INC']
|
||||
incs += ' ' + env['BF_ZLIB_INC']
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||
incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'
|
||||
|
5
extern/libmv/bundle.sh
vendored
5
extern/libmv/bundle.sh
vendored
@ -123,7 +123,8 @@ set(INC
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
|
||||
${PNG_INCLUDE_DIR}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
@ -214,6 +215,8 @@ src = env.Glob("*.cpp")
|
||||
$src
|
||||
|
||||
incs = '. ../Eigen3'
|
||||
incs += ' ' + env['BF_PNG_INC']
|
||||
incs += ' ' + env['BF_ZLIB_INC']
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||
incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'
|
||||
|
@ -759,7 +759,7 @@ static unsigned char *get_ucharbuf(ImBuf *ibuf)
|
||||
|
||||
*cp= FTOCHAR(0.2126f*rrgbf[0] + 0.7152f*rrgbf[1] + 0.0722f*rrgbf[2]);
|
||||
} else {
|
||||
char *rrgb= (char*)ibuf->rect + pixel*4;
|
||||
unsigned char *rrgb= (unsigned char*)ibuf->rect + pixel*4;
|
||||
|
||||
*cp= 0.2126f*rrgb[0] + 0.7152f*rrgb[1] + 0.0722f*rrgb[2];
|
||||
}
|
||||
@ -776,16 +776,12 @@ static unsigned char *get_search_bytebuf(ImBuf *ibuf, MovieTrackingTrack *track,
|
||||
{
|
||||
ImBuf *tmpibuf;
|
||||
unsigned char *pixels;
|
||||
int width, height;
|
||||
|
||||
width= (track->search_max[0]-track->search_min[0])*ibuf->x;
|
||||
height= (track->search_max[1]-track->search_min[1])*ibuf->y;
|
||||
|
||||
tmpibuf= BKE_tracking_get_search_imbuf(ibuf, track, marker, 0, 0, pos, origin);
|
||||
disable_imbuf_channels(tmpibuf, track);
|
||||
|
||||
*width_r= width;
|
||||
*height_r= height;
|
||||
*width_r= tmpibuf->x;
|
||||
*height_r= tmpibuf->y;
|
||||
|
||||
pixels= get_ucharbuf(tmpibuf);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user