[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49434] trunk/blender/source/blender/ blenkernel: fill in dummy values when using movie clip distort node but compiled without libmv .

[Campbell Barton]

Revision: 49434
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49434
Author:   campbellbarton
Date:     2012-07-31 22:01:44 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
fill in dummy values when using movie clip distort node but compiled without 
libmv.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_tracking.h
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tracking.h      2012-07-31 
21:26:14 UTC (rev 49433)
+++ trunk/blender/source/blender/blenkernel/BKE_tracking.h      2012-07-31 
22:01:44 UTC (rev 49434)
@@ -148,8 +148,8 @@
                                            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);

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c   2012-07-31 
21:26:14 UTC (rev 49433)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c   2012-07-31 
22:01:44 UTC (rev 49434)
@@ -1535,7 +1535,7 @@
        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 @@
                                    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 @@
        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
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs