archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Tracking: Cleanup, remove unused argument from image accessor

Browse Source
This commit is contained in:
Sergey Sharybin
2020-11-30 15:50:21 +01:00
parent ba3bf822a1
commit f280300b6a
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/tracking_auto.c
View File

@@ -395,7 +395,7 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
"auto track pointers");
/* Initialize image accessor. */
context->image_accessor = tracking_image_accessor_new(
context->clips, 1, context->input_tracks, num_total_tracks, user->framenr);
context->clips, 1, context->input_tracks, num_total_tracks);
/* Initialize auto track context and provide all information about currently
* tracked markers.
*/

4
source/blender/blenkernel/intern/tracking_util.c
View File

@@ -1009,8 +1009,7 @@ static void accessor_release_mask_callback(libmv_CacheKey cache_key)
TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR_CLIP],
int num_clips,
MovieTrackingTrack **tracks,
int num_tracks,
int start_frame)
int num_tracks)
{
TrackingImageAccessor *accessor = MEM_callocN(sizeof(TrackingImageAccessor),
"tracking image accessor");
@@ -1024,7 +1023,6 @@ TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR
accessor->num_clips = num_clips;
accessor->tracks = tracks;
accessor->num_tracks = num_tracks;
accessor->start_frame = start_frame;
accessor->libmv_accessor = libmv_FrameAccessorNew((libmv_FrameAccessorUserData *)accessor,
accessor_get_image_callback,

4
source/blender/blenkernel/tracking_private.h
View File

@@ -136,7 +136,6 @@ typedef struct TrackingImageAccessor {
int num_clips;
struct MovieTrackingTrack **tracks;
int num_tracks;
int start_frame;
struct libmv_FrameAccessor *libmv_accessor;
SpinLock cache_lock;
} TrackingImageAccessor;
@@ -144,8 +143,7 @@ typedef struct TrackingImageAccessor {
TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR_CLIP],
int num_clips,
MovieTrackingTrack **tracks,
int num_tracks,
int start_frame);
int num_tracks);
void tracking_image_accessor_destroy(TrackingImageAccessor *accessor);
#ifdef __cplusplus