commit beb4505311011130a7e54632137b0fbb5824cc9b
author Sameer Agarwal <sameeragarwal@google.com> Fri Feb 22 13:37:01 2013 -0800
committer Sameer Agarwal <sameeragarwal@google.com> Fri Feb 22 13:37:05 2013 -0800
tree 9a7670878814869b1f41ea5b9419b8b8cb4f4252
parent 9a88bd7c4b40e2a1e0cd9b0dc09a3517c467e04e

Minor fixes

Based on William Rucklidge's review, including
a nasty bug in parameter block removal.

Change-Id: I3a692e589f600ff560ecae9fa85bb0b76063d403

internal/ceres/problem_impl.cc

diff --git a/internal/ceres/problem_impl.cc b/internal/ceres/problem_impl.cc
index 6154ddf..ae4e7ed 100644
--- a/internal/ceres/problem_impl.cc
+++ b/internal/ceres/problem_impl.cc
@@ -177,7 +177,7 @@
 
 ProblemImpl::~ProblemImpl() {
   // Collect the unique cost/loss functions and delete the residuals.
-  const int num_residual_blocks =  program_->residual_blocks_.size();
+  const int num_residual_blocks = program_->residual_blocks_.size();
   cost_functions_to_delete_.reserve(num_residual_blocks);
   loss_functions_to_delete_.reserve(num_residual_blocks);
   for (int i = 0; i < program_->residual_blocks_.size(); ++i) {
@@ -486,8 +486,8 @@
       ResidualBlock* residual_block =
           (*(program_->mutable_residual_blocks()))[i];
       const int num_parameter_blocks = residual_block->NumParameterBlocks();
-      for (int i = 0; i < num_parameter_blocks; ++i) {
-        if (residual_block->parameter_blocks()[i] == parameter_block) {
+      for (int j = 0; j < num_parameter_blocks; ++j) {
+        if (residual_block->parameter_blocks()[j] == parameter_block) {
           RemoveResidualBlock(residual_block);
           // The parameter blocks are guaranteed unique.
           break;