From e43b4abd7a812437f08f607e687b6a94a792de16 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Thu, 29 Sep 2022 22:11:56 +0200 Subject: [PATCH 1/2] [sfmDataIO] bug fix getColmapCompatibleViews using find with two different vectors! --- src/aliceVision/sfmDataIO/colmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aliceVision/sfmDataIO/colmap.cpp b/src/aliceVision/sfmDataIO/colmap.cpp index 53245a8168..a071b7a3ab 100644 --- a/src/aliceVision/sfmDataIO/colmap.cpp +++ b/src/aliceVision/sfmDataIO/colmap.cpp @@ -77,7 +77,7 @@ CompatibleList getColmapCompatibleViews(const sfmData::SfMData& sfmData) { continue; } - if(compatibleIntrinsics.find(view->getIntrinsicId()) != compatibleViews.end()) + if(compatibleIntrinsics.count(view->getIntrinsicId()) > 0) { compatibleViews.insert(viewID); } From 90e05dd73c31803d9d4256fe6a6a81290619bfa3 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Thu, 29 Sep 2022 22:12:19 +0200 Subject: [PATCH 2/2] [cmake] fix prefix for test name --- src/aliceVision/sfmDataIO/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aliceVision/sfmDataIO/CMakeLists.txt b/src/aliceVision/sfmDataIO/CMakeLists.txt index 27a93b75bb..dc65a826df 100644 --- a/src/aliceVision/sfmDataIO/CMakeLists.txt +++ b/src/aliceVision/sfmDataIO/CMakeLists.txt @@ -82,7 +82,7 @@ endif() alicevision_add_test(middlebury_test.cpp - NAME "middlebury" + NAME "sfmDataIO_middlebury" LINKS aliceVision_sfmData aliceVision_numeric aliceVision_sfmDataIO