[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39488] branches/soc-2011-tomato: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Wed Aug 17 13:17:18 CEST 2011
Revision: 39488
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39488
Author: nazgul
Date: 2011-08-17 11:17:18 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
Additional code clean-up and fixed typo.
No functional changes.
Modified Paths:
--------------
branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
branches/soc-2011-tomato/extern/libmv/libmv-capi.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp 2011-08-17 11:14:21 UTC (rev 39487)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp 2011-08-17 11:17:18 UTC (rev 39488)
@@ -309,7 +309,7 @@
/* ************ Tracks ************ */
-void libmv_SADSamplePatternByte(unsigned char *image, int stride,
+void libmv_SADSamplePattern(unsigned char *image, int stride,
float warp[3][3], unsigned char *pattern)
{
float mat3[9];
Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi.h 2011-08-17 11:14:21 UTC (rev 39487)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi.h 2011-08-17 11:17:18 UTC (rev 39488)
@@ -51,7 +51,7 @@
void libmv_regionTrackerDestroy(struct libmv_RegionTracker *libmv_tracker);
/* SAD Tracker */
-void libmv_SADSamplePatternByte(unsigned char *image, int stride,
+void libmv_SADSamplePattern(unsigned char *image, int stride,
float warp[3][3], unsigned char *pattern);
int libmv_SADTrackerTrack(unsigned char *pattern, unsigned char *image, int stride,
int width, int height, double *x, double *y);
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2011-08-17 11:14:21 UTC (rev 39487)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2011-08-17 11:17:18 UTC (rev 39488)
@@ -23,7 +23,7 @@
class CLIP_OT_track_to_empty(Operator):
bl_idname = "clip.track_to_empty"
- bl_label = "2D Track to Emppty"
+ bl_label = "2D Track to Empty"
bl_options = {'UNDO', 'REGISTER'}
@classmethod
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c 2011-08-17 11:14:21 UTC (rev 39487)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c 2011-08-17 11:17:18 UTC (rev 39488)
@@ -949,7 +949,7 @@
warp[1][2]= pos[1];
track_context->pattern= MEM_callocN(sizeof(unsigned char)*16*16, "trackking pattern");
- libmv_SADSamplePatternByte(image, width, warp, track_context->pattern);
+ libmv_SADSamplePattern(image, width, warp, track_context->pattern);
MEM_freeN(image);
IMB_freeImBuf(ibuf);
More information about the Bf-blender-cvs
mailing list