From f7460b7d0194a87fd36364ea29a197ec19bc0968 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Tue, 8 Sep 2020 14:16:28 +0200 Subject: [PATCH] [sfmDataIO] throw if we try to load an abc file and AliceVision is built without Alembic support fix #890 --- src/aliceVision/sfmDataIO/sfmDataIO.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/aliceVision/sfmDataIO/sfmDataIO.cpp b/src/aliceVision/sfmDataIO/sfmDataIO.cpp index e6e51aea98..e9459d5038 100644 --- a/src/aliceVision/sfmDataIO/sfmDataIO.cpp +++ b/src/aliceVision/sfmDataIO/sfmDataIO.cpp @@ -101,13 +101,15 @@ bool Load(sfmData::SfMData& sfmData, const std::string& filename, ESfMData partF { status = loadJSON(sfmData, filename, partFlag); } -#if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_ALEMBIC) - else if(extension == ".abc") // Alembic + else if (extension == ".abc") // Alembic { - AlembicImporter(filename).populateSfM(sfmData, partFlag); - status = true; +#if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_ALEMBIC) + AlembicImporter(filename).populateSfM(sfmData, partFlag); + status = true; +#else + ALICEVISION_THROW_ERROR("Cannot load the ABC file: \"" << filename << "\", AliceVision is built without Alembic support."); +#endif } -#endif // ALICEVISION_HAVE_ALEMBIC else if(fs::is_directory(filename)) { status = readGt(filename, sfmData);