[sfmDataIO] moving 1.2.0 compatibility code to camera

alicevision · Aug 16, 2021 · 5ed3d73 · 5ed3d73
1 parent ab06acf
commit 5ed3d73
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/src/aliceVision/camera/IntrinsicsScaleOffset.hpp b/src/aliceVision/camera/IntrinsicsScaleOffset.hpp
@@ -175,7 +175,24 @@ class IntrinsicsScaleOffset: public IntrinsicBase
    */
   bool importFromParams(const std::vector<double>& params, const Version & inputVersion) override
   {
-    if (!updateFromParams(params))
+    std::vector<double> paramsLocal;
+    if (inputVersion < Version(1, 2, 0))
+    {
+      paramsLocal.resize(params.size() + 1);
+      paramsLocal[0] = params[0];
+      paramsLocal[1] = params[0];
+
+      for (int i = 1; i < params.size(); i++)
+      {
+        paramsLocal[i + 1] = params[i];
+      }
+    }
+    else 
+    {
+      paramsLocal = params;
+    }
+
+    if (!updateFromParams(paramsLocal))
     {
        return false;
     }

diff --git a/src/aliceVision/sfmDataIO/AlembicImporter.cpp b/src/aliceVision/sfmDataIO/AlembicImporter.cpp
@@ -489,25 +489,7 @@ bool readCamera(const Version & abcVersion, const ICamera& camera, const M44d& m
         Alembic::Abc::IDoubleArrayProperty prop(userProps, "mvg_intrinsicParams");
         Alembic::Abc::IDoubleArrayProperty::sample_ptr_type sample;
         prop.get(sample, ISampleSelector(sampleFrame));
-
-        if (abcVersion < Version(1,2,0)) // abcVersion < 1.2
-        {
-            std::vector<double> params;
-            params.assign(sample->get(), sample->get() + sample->size());
-
-            // Fx == Fy
-            mvg_intrinsicParams.push_back(params[0]);
-            mvg_intrinsicParams.push_back(params[0]);
-
-            for (int i = 1; i < params.size(); i++)
-            {
-                mvg_intrinsicParams.push_back(params[i]);
-            }
-        }
-        else // abcVersion >= 1.2
-        {
-            mvg_intrinsicParams.assign(sample->get(), sample->get()+sample->size());
-        }
+        mvg_intrinsicParams.assign(sample->get(), sample->get()+sample->size());
       }
     }
   }