Merge pull request #1744 from alicevision/fix/intrinsics

fix alembic I/O
alicevision · Sep 11, 2024 · 573a69a · 573a69a
2 parents e914101 + 891dff5
commit 573a69a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/aliceVision/sfmDataIO/AlembicExporter.cpp b/src/aliceVision/sfmDataIO/AlembicExporter.cpp
@@ -226,10 +226,11 @@ void AlembicExporter::DataImpl::addCamera(const std::string& name,
         OStringProperty(userProps, "mvg_intrinsicType").set(intrinsicCasted->getTypeStr());
         OStringProperty(userProps, "mvg_intrinsicInitializationMode").set(camera::EInitMode_enumToString(intrinsicCasted->getInitializationMode()));
         ODoubleProperty(userProps, "mvg_initialFocalLength").set(initialFocalLength);
+        OStringProperty(userProps, "mvg_intrinsicSerialNumber").set(intrinsicCasted->serialNumber());
         OBoolProperty(userProps, "mvg_intrinsicLocked").set(intrinsicCasted->isLocked());
         OBoolProperty(userProps, "mvg_intrinsicPixelRatioLocked").set(intrinsicCasted->isRatioLocked());
         OBoolProperty(userProps, "mvg_intrinsicOffsetLocked").set(intrinsicCasted->isOffsetLocked());
-        OBoolProperty(userProps, "mvg_intrinsicScaleLocked").set(intrinsicCasted->isOffsetLocked());
+        OBoolProperty(userProps, "mvg_intrinsicScaleLocked").set(intrinsicCasted->isScaleLocked());
         OStringProperty(userProps, "mvg_intrinsicDistortionInitializationMode")
           .set(camera::EInitMode_enumToString(intrinsicCasted->getDistortionInitializationMode()));
 

diff --git a/src/aliceVision/sfmDataIO/AlembicImporter.cpp b/src/aliceVision/sfmDataIO/AlembicImporter.cpp
@@ -428,6 +428,7 @@ bool readCamera(const Version& abcVersion,
     double undistortionDiagonal = 0.0;
     double undistortionPixelAspectRatio = 1.0;
     bool undistortionDesqueezed = false;
+    std::string serialNumber = "";
 
     if (userProps)
     {
@@ -464,6 +465,10 @@ bool readCamera(const Version& abcVersion,
             {
                 resectionId = getAbcProp_uint(userProps, *propHeader, "mvg_resectionId", sampleFrame);
             }
+            if (const Alembic::Abc::PropertyHeader* propHeader = userProps.getPropertyHeader("mvg_intrinsicSerialNumber"))
+            {
+                serialNumber = getAbcProp<Alembic::Abc::IStringProperty>(userProps, *propHeader, "mvg_intrinsicSerialNumber", sampleFrame);
+            }
             if (const Alembic::Abc::PropertyHeader* propHeader = userProps.getPropertyHeader("mvg_intrinsicLocked"))
             {
                 intrinsicLocked = getAbcProp<Alembic::Abc::IBoolProperty>(userProps, *propHeader, "mvg_intrinsicLocked", sampleFrame);
@@ -657,6 +662,7 @@ bool readCamera(const Version& abcVersion,
           /*width*/ sensorSize_pix.at(0),
           /*height*/ sensorSize_pix.at(1));
 
+        intrinsic->setSerialNumber(serialNumber);
         intrinsic->setSensorWidth(sensorSize_mm.at(0));
         intrinsic->setSensorHeight(sensorSize_mm.at(1));
         intrinsic->importFromParams(mvg_intrinsicParams, abcVersion);