$OpenBSD$

Index: src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp
--- src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp.orig
+++ src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
   NViewDataSet d2 = d;
 
   //-- Set to 0 the future computed data to be sure of computation results :
-  d2._X.fill(0); //Set _Xi of dataset 2 to 0 to be sure of new data computation
+  d2._Xpoints.fill(0); //Set _Xi of dataset 2 to 0 to be sure of new data computation
   fill(d2._t.begin(), d2._t.end(), Vec3(0.0,0.0,0.0));
 
   //Create the mega matrix
@@ -86,13 +86,13 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
         size_t index = i*3;
         d2._t[i] = Vec3(vec_solution[index], vec_solution[index+1], vec_solution[index+2]);
         // Change Ci to -Ri*Ci
-        d2._C[i] = -d2._R[i] * d2._t[i];
+        d2._Centre[i] = -d2._R[i] * d2._t[i];
       }
 
       //-- Now the Xi :
       for (size_t i=0; i < nbPoints; ++i) {
         size_t index = 3*nViews;
-        d2._X.col(i) = Vec3(vec_solution[index+i*3], vec_solution[index+i*3+1], vec_solution[index+i*3+2]);
+        d2._Xpoints.col(i) = Vec3(vec_solution[index+i*3], vec_solution[index+i*3+1], vec_solution[index+i*3+2]);
       }
     }
 
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
     for (size_t i = 0; i < d2._n; ++i) {
       for(size_t k = 0; k < d._x[0].cols(); ++k)
       {
-        xk = Project(d2.P(i), Vec3(d2._X.col(k)));
+        xk = Project(d2.P(i), Vec3(d2._Xpoints.col(k)));
         xsum += Vec2(( xk - d2._x[i].col(k)).array().pow(2));
       }
     }
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
   NViewDataSet d2 = d;
 
   //-- Set to 0 the future computed data to be sure of computation results :
-  d2._X.fill(0); //Set _Xi of dataset 2 to 0 to be sure of new data computation
+  d2._Xpoints.fill(0); //Set _Xi of dataset 2 to 0 to be sure of new data computation
   fill(d2._t.begin(), d2._t.end(), Vec3(0.0,0.0,0.0));
 
   //Create the mega matrix
@@ -174,13 +174,13 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
         size_t index = i*3;
         d2._t[i] = d._K[0].inverse() * Vec3(vec_solution[index], vec_solution[index+1], vec_solution[index+2]);
         // Change Ci to -Ri*Ci
-        d2._C[i] = -d2._R[i] * d2._t[i];
+        d2._Centre[i] = -d2._R[i] * d2._t[i];
       }
 
       //-- Now the Xi :
       for (size_t i=0; i < nbPoints; ++i) {
         size_t index = 3*nViews;
-        d2._X.col(i) = Vec3(vec_solution[index+i*3], vec_solution[index+i*3+1], vec_solution[index+i*3+2]);
+        d2._Xpoints.col(i) = Vec3(vec_solution[index+i*3], vec_solution[index+i*3+1], vec_solution[index+i*3+2]);
       }
     }
 
@@ -189,7 +189,7 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
     for (size_t i = 0; i < d2._n; ++i) {
       for(size_t k = 0; k < (size_t)d._x[0].cols(); ++k)
       {
-        xk = Project(d2.P(i), Vec3(d2._X.col(k)));
+        xk = Project(d2.P(i), Vec3(d2._Xpoints.col(k)));
         xsum += Vec2(( xk - d2._x[i].col(k)).array().pow(2));
       }
     }
@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
   NViewDataSet d2 = d;
 
   //-- Set to 0 the future computed data to be sure of computation results :
-  d2._X.fill(0); //Set _Xi of dataset 2 to 0 to be sure of new data computation
+  d2._Xpoints.fill(0); //Set _Xi of dataset 2 to 0 to be sure of new data computation
   fill(d2._t.begin(), d2._t.end(), Vec3(0.0,0.0,0.0));
 
   //Create the mega matrix
@@ -259,13 +259,13 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
         size_t index = i*3;
         d2._t[i] = Vec3(vec_solution[index], vec_solution[index+1], vec_solution[index+2]);
         // Change Ci to -Ri*Ci
-        d2._C[i] = -d2._R[i] * d2._t[i];
+        d2._Centre[i] = -d2._R[i] * d2._t[i];
       }
 
       //-- Now the Xi :
       for (size_t i=0; i < nbPoints; ++i) {
         size_t index = 3*nViews;
-        d2._X.col(i) = Vec3(vec_solution[index+i*3], vec_solution[index+i*3+1], vec_solution[index+i*3+2]);
+        d2._Xpoints.col(i) = Vec3(vec_solution[index+i*3], vec_solution[index+i*3+1], vec_solution[index+i*3+2]);
       }
     }
 
@@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE(Translation_Structure_L_Infinity_
     for (size_t i = 0; i < d2._n; ++i) {
       for(size_t k = 0; k < d._x[0].cols(); ++k)
       {
-        xk = Project(d2.P(i), Vec3(d2._X.col(k)));
+        xk = Project(d2.P(i), Vec3(d2._Xpoints.col(k)));
         xsum += Vec2(( xk - d2._x[i].col(k)).array().pow(2));
       }
     }
