[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58851] branches/soc-2013-motion_track/ extern/libmv: Rename CameraForViewImage to CameraForImage
Joseph Mansfield
sftrabbit at gmail.com
Sat Aug 3 12:30:39 CEST 2013
Revision: 58851
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58851
Author: sftrabbit
Date: 2013-08-03 10:30:39 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Rename CameraForViewImage to CameraForImage
It is uncommon to refer to an image without a particular view, so shorten the function name for simplicity. If a function is needed that references all views at once, suffixing with AllViews will do.
Modified Paths:
--------------
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc
Modified: branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/bundle.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/bundle.cc 2013-08-03 09:46:38 UTC (rev 58850)
+++ branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/bundle.cc 2013-08-03 10:30:39 UTC (rev 58851)
@@ -255,7 +255,7 @@
all_cameras_R_t.resize(max_image + 1);
for (int i = 0; i <= max_image; i++) {
- const EuclideanCamera *camera = reconstruction.CameraForViewImage(0, i);
+ const EuclideanCamera *camera = reconstruction.CameraForImage(0, i);
if (!camera) {
continue;
@@ -276,7 +276,7 @@
int max_image = tracks.MaxImage();
for (int i = 0; i <= max_image; i++) {
- EuclideanCamera *camera = reconstruction->CameraForViewImage(0, i);
+ EuclideanCamera *camera = reconstruction->CameraForImage(0, i);
if (!camera) {
continue;
@@ -343,7 +343,7 @@
int max_image = tracks.MaxImage();
bool is_first_camera = true;
for (int i = 0; i <= max_image; i++) {
- const EuclideanCamera *camera = reconstruction->CameraForViewImage(0, i);
+ const EuclideanCamera *camera = reconstruction->CameraForImage(0, i);
if (camera) {
double *current_camera_R_t = &(*all_cameras_R_t)[i](0);
@@ -455,7 +455,7 @@
bool have_locked_camera = false;
for (int i = 0; i < markers.size(); ++i) {
const Marker &marker = markers[i];
- EuclideanCamera *camera = reconstruction->CameraForViewImage(0, marker.image);
+ EuclideanCamera *camera = reconstruction->CameraForImage(0, marker.image);
EuclideanPoint *point = reconstruction->PointForTrack(marker.track);
if (camera == NULL || point == NULL) {
continue;
Modified: branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/intersect.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/intersect.cc 2013-08-03 09:46:38 UTC (rev 58850)
+++ branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/intersect.cc 2013-08-03 10:30:39 UTC (rev 58851)
@@ -78,7 +78,7 @@
vector<Mat34> cameras;
Mat34 P;
for (int i = 0; i < markers.size(); ++i) {
- EuclideanCamera *camera = reconstruction->CameraForViewImage(0, markers[i].image);
+ EuclideanCamera *camera = reconstruction->CameraForImage(0, markers[i].image);
P_From_KRt(K, camera->R, camera->t, &P);
cameras.push_back(P);
}
@@ -103,7 +103,7 @@
for (int i = 0; i < markers.size(); ++i) {
const Marker &marker = markers[i];
const EuclideanCamera &camera =
- *reconstruction->CameraForViewImage(0, marker.image);
+ *reconstruction->CameraForImage(0, marker.image);
problem.AddResidualBlock(
new ceres::AutoDiffCostFunction<
@@ -131,7 +131,7 @@
// Try projecting the point; make sure it's in front of everyone.
for (int i = 0; i < cameras.size(); ++i) {
const EuclideanCamera &camera =
- *reconstruction->CameraForViewImage(0, markers[i].image);
+ *reconstruction->CameraForImage(0, markers[i].image);
Vec3 x = camera.R * X + camera.t;
if (x(2) < 0) {
LOG(ERROR) << "POINT BEHIND CAMERA " << markers[i].image
@@ -164,7 +164,7 @@
residuals.setZero();
for (int i = 0; i < markers.size(); ++i) {
const ProjectiveCamera &camera =
- *reconstruction.CameraForViewImage(0, markers[i].image);
+ *reconstruction.CameraForImage(0, markers[i].image);
Vec3 projected = camera.P * X;
projected /= projected(2);
residuals[2*i + 0] = projected(0) - markers[i].x;
@@ -187,7 +187,7 @@
// Get the cameras to use for the intersection.
vector<Mat34> cameras;
for (int i = 0; i < markers.size(); ++i) {
- ProjectiveCamera *camera = reconstruction->CameraForViewImage(0, markers[i].image);
+ ProjectiveCamera *camera = reconstruction->CameraForImage(0, markers[i].image);
cameras.push_back(camera->P);
}
@@ -215,7 +215,7 @@
// Try projecting the point; make sure it's in front of everyone.
for (int i = 0; i < cameras.size(); ++i) {
const ProjectiveCamera &camera =
- *reconstruction->CameraForViewImage(0, markers[i].image);
+ *reconstruction->CameraForImage(0, markers[i].image);
Vec3 x = camera.P * X;
if (x(2) < 0) {
LOG(ERROR) << "POINT BEHIND CAMERA " << markers[i].image
Modified: branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/pipeline.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/pipeline.cc 2013-08-03 09:46:38 UTC (rev 58850)
+++ branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/pipeline.cc 2013-08-03 10:30:39 UTC (rev 58851)
@@ -169,7 +169,7 @@
vector<Marker> reconstructed_markers;
for (int i = 0; i < all_markers.size(); ++i) {
- if (reconstruction->CameraForViewImage(all_markers[i].view, all_markers[i].image)) {
+ if (reconstruction->CameraForImage(all_markers[i].view, all_markers[i].image)) {
reconstructed_markers.push_back(all_markers[i]);
}
}
@@ -199,7 +199,7 @@
// Do all possible resections.
num_resects = 0;
for (int image = 0; image <= max_image; ++image) {
- if (reconstruction->CameraForViewImage(0, image)) {
+ if (reconstruction->CameraForImage(0, image)) {
LG << "Skipping frame: " << image;
continue;
}
@@ -239,7 +239,7 @@
// One last pass...
num_resects = 0;
for (int image = 0; image <= max_image; ++image) {
- if (reconstruction->CameraForViewImage(0, image)) {
+ if (reconstruction->CameraForImage(0, image)) {
LG << "Skipping frame: " << image;
continue;
}
@@ -282,7 +282,7 @@
vector<Marker> markers = image_tracks.AllMarkers();
for (int i = 0; i < markers.size(); ++i) {
const typename PipelineRoutines::Camera *camera =
- reconstruction.CameraForViewImage(0, markers[i].image);
+ reconstruction.CameraForImage(0, markers[i].image);
const typename PipelineRoutines::Point *point =
reconstruction.PointForTrack(markers[i].track);
if (!camera || !point) {
Modified: branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.cc 2013-08-03 09:46:38 UTC (rev 58850)
+++ branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.cc 2013-08-03 10:30:39 UTC (rev 58851)
@@ -69,14 +69,14 @@
points_[track].X = X;
}
-EuclideanCamera *EuclideanReconstruction::CameraForViewImage(
+EuclideanCamera *EuclideanReconstruction::CameraForImage(
int view, int image) {
return const_cast<EuclideanCamera *>(
static_cast<const EuclideanReconstruction *>(
- this)->CameraForViewImage(view, image));
+ this)->CameraForImage(view, image));
}
-const EuclideanCamera *EuclideanReconstruction::CameraForViewImage(
+const EuclideanCamera *EuclideanReconstruction::CameraForImage(
int view, int image) const {
if (view < 0 || view >= cameras_.size() ||
image < 0 || image >= cameras_[view].size()) {
@@ -166,13 +166,13 @@
points_[track].X = X;
}
-ProjectiveCamera *ProjectiveReconstruction::CameraForViewImage(int view, int image) {
+ProjectiveCamera *ProjectiveReconstruction::CameraForImage(int view, int image) {
return const_cast<ProjectiveCamera *>(
static_cast<const ProjectiveReconstruction *>(
- this)->CameraForViewImage(view, image));
+ this)->CameraForImage(view, image));
}
-const ProjectiveCamera *ProjectiveReconstruction::CameraForViewImage(
+const ProjectiveCamera *ProjectiveReconstruction::CameraForImage(
int view, int image) const {
if (view < 0 || view >= cameras_.size() ||
image < 0 || image >= cameras_[view].size()) {
Modified: branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.h
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.h 2013-08-03 09:46:38 UTC (rev 58850)
+++ branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction.h 2013-08-03 10:30:39 UTC (rev 58851)
@@ -125,8 +125,8 @@
void InsertPoint(int track, const Vec3 &X);
/// Returns a pointer to the camera corresponding to \a view and \a image.
- EuclideanCamera *CameraForViewImage(int view, int image);
- const EuclideanCamera *CameraForViewImage(int view, int image) const;
+ EuclideanCamera *CameraForImage(int view, int image);
+ const EuclideanCamera *CameraForImage(int view, int image) const;
/// Returns all cameras for all views.
std::vector<vector<EuclideanCamera> > AllCameras() const;
@@ -221,8 +221,8 @@
void InsertPoint(int track, const Vec4 &X);
/// Returns a pointer to the camera corresponding to \a image.
- ProjectiveCamera *CameraForViewImage(int view, int image);
- const ProjectiveCamera *CameraForViewImage(int view, int image) const;
+ ProjectiveCamera *CameraForImage(int view, int image);
+ const ProjectiveCamera *CameraForImage(int view, int image) const;
/// Returns all cameras.
std::vector<vector<ProjectiveCamera> > AllCameras() const;
Modified: branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc 2013-08-03 09:46:38 UTC (rev 58850)
+++ branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc 2013-08-03 10:30:39 UTC (rev 58851)
@@ -53,7 +53,7 @@
// Rescale cameras positions.
for (int i = 0; i < all_cameras.size(); ++i) {
int image = all_cameras[i].image;
- EuclideanCamera *camera = reconstruction->CameraForViewImage(0, image);
+ EuclideanCamera *camera = reconstruction->CameraForImage(0, image);
camera->t = camera->t * scale_factor;
}
Modified: branches/soc-2013-motion_track/extern/libmv/libmv-capi.cc
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list