[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54845] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Camera tracking, minor changes:

[Sergey Sharybin]

Revision: 54845
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54845
Author:   nazgul
Date:     2013-02-25 09:46:47 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Camera tracking, minor changes:

- Fill in image dimension for camera intrinsics used for
  solution refirement.
- Retrieve K3 from camera intrinsics after refining.

Shall be no functional changes, just makes things clear
and robust for further improvements.

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

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-02-25 09:44:12 UTC (rev 54844)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-02-25 09:46:47 UTC (rev 54845)
@@ -2663,6 +2663,8 @@
 	float principal_point[2];
 	float k1, k2, k3;
 
+	int width, height;
+
 	float reprojection_error;
 
 	TracksMap *tracks_map;
@@ -2723,11 +2725,13 @@
 	                              &k1, &k2, &k3, &width, &height);
 
 	tracking->camera.focal = focal_length;
+
 	tracking->camera.principal[0] = principal_x;
+	tracking->camera.principal[1] = principal_y / aspy;
 
-	tracking->camera.principal[1] = principal_y / aspy;
 	tracking->camera.k1 = k1;
 	tracking->camera.k2 = k2;
+	tracking->camera.k3 = k3;
 }
 
 static int reconstruct_retrieve_libmv_tracks(MovieReconstructContext *context, MovieTracking *tracking)
@@ -2935,6 +2939,9 @@
 	context->principal_point[0] = camera->principal[0];
 	context->principal_point[1] = camera->principal[1] * aspy;
 
+	context->width = width;
+	context->height = height;
+
 	context->k1 = camera->k1;
 	context->k2 = camera->k2;
 	context->k3 = camera->k3;
@@ -3030,8 +3037,8 @@
 	camera_intrinsics_options->k2 = context->k2;
 	camera_intrinsics_options->k3 = context->k3;
 
-	camera_intrinsics_options->image_width = 0;
-	camera_intrinsics_options->image_height = 0;
+	camera_intrinsics_options->image_width = context->width;
+	camera_intrinsics_options->image_height = context->height;
 }
 
 static void reconstructionOptionsFromContext(libmv_reconstructionOptions *reconstruction_options,