tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

fill in dummy values when using movie clip distort node but compiled without libmv.

This commit is contained in:
Campbell Barton 2012-07-31 22:01:44 +00:00
parent 33a9cafc3b
commit 872ebc7310
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,8 +148,8 @@ struct ImBuf *BKE_tracking_distortion_exec(struct MovieDistortion *distortion, s
struct ImBuf *ibuf, int width, int height, float overscan, int undistort);
void BKE_tracking_distortion_free(struct MovieDistortion *distortion);
void BKE_tracking_distort_v2(struct MovieTracking *tracking, float co[2], float nco[2]);
void BKE_tracking_undistort_v2(struct MovieTracking *tracking, float co[2], float nco[2]);
void BKE_tracking_distort_v2(struct MovieTracking *tracking, const float co[2], float r_co[2]);
void BKE_tracking_undistort_v2(struct MovieTracking *tracking, const float co[2], float r_co[2]);
struct ImBuf *BKE_tracking_undistort_frame(struct MovieTracking *tracking, struct ImBuf *ibuf,
int calibration_width, int calibration_height, float overscan);

16
source/blender/blenkernel/intern/tracking.c
View File

@ -1535,7 +1535,7 @@ void BKE_tracking_distortion_free(MovieDistortion *distortion)
MEM_freeN(distortion);
}
void BKE_tracking_distort_v2(MovieTracking *tracking, float co[2], float nco[2])
void BKE_tracking_distort_v2(MovieTracking *tracking, const float co[2], float r_co[2])
{
MovieTrackingCamera *camera = &tracking->camera;
@ -1551,16 +1551,16 @@ void BKE_tracking_distort_v2(MovieTracking *tracking, float co[2], float nco[2])
camera->k1, camera->k2, camera->k3, x, y, &x, &y);
/* result is in image coords already */
nco[0] = x;
nco[1] = y;
r_co[0] = x;
r_co[1] = y;
#else
(void) camera;
(void) co;
(void) nco;
zero_v2(r_co);
#endif
}
void BKE_tracking_undistort_v2(MovieTracking *tracking, float co[2], float nco[2])
void BKE_tracking_undistort_v2(MovieTracking *tracking, const float co[2], float r_co[2])
{
MovieTrackingCamera *camera = &tracking->camera;
@ -1571,12 +1571,12 @@ void BKE_tracking_undistort_v2(MovieTracking *tracking, float co[2], float nco[2
libmv_InvertIntrinsics(camera->focal, camera->principal[0], camera->principal[1] * aspy,
camera->k1, camera->k2, camera->k3, x, y, &x, &y);
nco[0] = x * camera->focal + camera->principal[0];
nco[1] = y * camera->focal + camera->principal[1] * aspy;
r_co[0] = x * camera->focal + camera->principal[0];
r_co[1] = y * camera->focal + camera->principal[1] * aspy;
#else
(void) camera;
(void) co;
(void) nco;
zero_v2(r_co);
#endif
}