Revision: 58878
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58878
Author: nazgul
Date: 2013-08-03 20:19:05 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Code cleanup: made function name consistemt
Modified Paths:
--------------
branches/soc-2011-tomato/extern/libmv/libmv-capi.cc
branches/soc-2011-tomato/extern/libmv/libmv-capi.h
branches/soc-2011-tomato/extern/libmv/libmv-capi_stub.cc
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi.cc 2013-08-03 19:54:00 UTC
(rev 58877)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi.cc 2013-08-03 20:19:05 UTC
(rev 58878)
@@ -1082,7 +1082,7 @@
}
}
-void libmv_ApplyInverseCanonicalHomography(double x, double y,
+void libmv_applyInverseCanonicalHomography(double x, double y,
const double *xs, const double *ys,
int num_samples_x, int
num_samples_y,
double *warped_position_x,
@@ -1107,12 +1107,12 @@
x2_mat.col(i) = libmv::Vec2(x2[i][0], x2[i][1]);
}
- LG << "x1:\n" << x1_mat;
- LG << "x2:\n" << x2_mat;
+ LG << "x1: " << x1_mat;
+ LG << "x2: " << x2_mat;
libmv::Homography2DFromCorrespondencesLinear(x1_mat, x2_mat, &H_mat,
expected_precision);
- LG << "H:\n" << H_mat;
+ LG << "H: " << H_mat;
memcpy(H, H_mat.data(), 9 * sizeof(double));
}
Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi.h 2013-08-03 19:54:00 UTC
(rev 58877)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi.h 2013-08-03 20:19:05 UTC
(rev 58878)
@@ -159,7 +159,7 @@
void libmv_cameraIntrinsicsInvert(const libmv_CameraIntrinsicsOptions
*libmv_camera_intrinsics_options,
double x, double y, double *x1, double *y1);
-void libmv_ApplyInverseCanonicalHomography(double x, double y,
+void libmv_applyInverseCanonicalHomography(double x, double y,
const double *xs, const double *ys,
int num_samples_x, int
num_samples_y,
double *warped_position_x,
Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi_stub.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi_stub.cc 2013-08-03
19:54:00 UTC (rev 58877)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi_stub.cc 2013-08-03
20:19:05 UTC (rev 58878)
@@ -277,7 +277,7 @@
*y1 = (y - principal_y) / focal_length;
}
-void libmv_ApplyInverseCanonicalHomography(double x, double y,
+void libmv_applyInverseCanonicalHomography(double x, double y,
const double *xs, const double *ys,
int num_samples_x, int
num_samples_y,
double *warped_position_x,
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2013-08-03 19:54:00 UTC (rev 58877)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2013-08-03 20:19:05 UTC (rev 58878)
@@ -3284,7 +3284,7 @@
get_marker_coords_for_tracking(frame_width, frame_height, marker, xs,
ys);
- libmv_ApplyInverseCanonicalHomography(x - 0.5f, y - 0.5f,
+ libmv_applyInverseCanonicalHomography(x - 0.5f, y - 0.5f,
xs, ys,
num_samples_x,
num_samples_y,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
