Skip to content

Commit 374783c

Browse files
committed
[filterSfM] small change for nanoflann update
1 parent a8d113a commit 374783c

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/software/pipeline/main_filterSfM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ bool filterLandmarks(SfMData& sfmData, double radiusScale, bool useFeatureScale,
208208
for(auto i = 0; i < landmarksData.size(); i++)
209209
{
210210
PixSizeSearch search(landmarksPixSize[i] * radiusScale, landmarksPixSize, i);
211-
bool found = tree.findNeighbors(search, landmarksData[i].X.data(), nanoflann::SearchParams());
211+
bool found = tree.findNeighbors(search, landmarksData[i].X.data(), nanoflann::SearchParameters());
212212
if (found)
213213
{
214214
toRemove[i] = true;

src/software/pipeline/main_prepareDenseScene.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,6 @@ bool prepareDenseScene(const SfMData& sfmData,
298298
image(pix).a() = (maskLoaded && mask(pix) == 0) ? 0.f : (doMaskLandmarks && maskLandmarks(pix) == 127) ? .5f : 1.f;
299299
}
300300
});
301-
/* else
302-
{
303-
const auto noMaskingFunc = [] (Image<RGBAfColor> & image) {};
304-
process<Image<RGBAfColor>>(dstColorImage, cam, metadata, srcImage, evCorrection, exposureCompensation, noMaskingFunc);
305-
}*/
306301
}
307302

308303
++progressDisplay;
@@ -413,8 +408,8 @@ int aliceVision_main(int argc, char *argv[])
413408
}
414409

415410
// export
416-
if(prepareDenseScene(sfmData, imagesFolders, masksFolders, maskExtension, rangeStart, rangeEnd, outFolder, outputFileType,
417-
saveMetadata, saveMatricesTxtFiles, evCorrection, landmarksMaskScale))
411+
if(prepareDenseScene(sfmData, imagesFolders, masksFolders, maskExtension, rangeStart, rangeEnd, outFolder,
412+
outputFileType, saveMetadata, saveMatricesTxtFiles, evCorrection, landmarksMaskScale))
418413
return EXIT_SUCCESS;
419414

420415
return EXIT_FAILURE;

0 commit comments

Comments
 (0)