From 17e7629783769922501b5c8b5a7786ab3226aa36 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Sun, 26 Apr 2020 14:46:37 +0200 Subject: [PATCH] [unittest] fix deprecated include --- src/aliceVision/camera/pinholeBrown_test.cpp | 2 +- src/aliceVision/camera/pinholeFisheye1_test.cpp | 2 +- src/aliceVision/camera/pinholeFisheye_test.cpp | 2 +- src/aliceVision/camera/pinholeRadial_test.cpp | 2 +- .../colorHarmonization/gainOffsetConstraintBuilder_test.cpp | 2 +- src/aliceVision/feature/features_test.cpp | 2 +- src/aliceVision/geometry/frustumIntersection_test.cpp | 2 +- src/aliceVision/geometry/halfSpaceIntersection_test.cpp | 2 +- src/aliceVision/geometry/rigidTransformation3D_test.cpp | 2 +- src/aliceVision/graph/connectedComponent_test.cpp | 2 +- src/aliceVision/graph/triplet_test.cpp | 2 +- src/aliceVision/image/drawing_test.cpp | 2 +- src/aliceVision/image/filtering_test.cpp | 2 +- src/aliceVision/image/image_test.cpp | 2 +- src/aliceVision/image/io_test.cpp | 2 +- src/aliceVision/image/resampling_test.cpp | 2 +- .../lightingEstimation/lightingEstimation_test.cpp | 2 +- .../lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp | 2 +- .../lInftyCV_global_translations_fromTriplets_test.cpp | 2 +- .../lInfinityCV/lInftyCV_resection_robust_test.cpp | 2 +- .../linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp | 2 +- .../lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp | 2 +- .../lInfinityCV/lInftyCV_tijsAndXis_test.cpp | 2 +- .../lInfinityCV/lInftyCV_triangulation_test.cpp | 2 +- src/aliceVision/linearProgramming/linearProgramming_test.cpp | 2 +- src/aliceVision/localization/LocalizationResult_test.cpp | 2 +- src/aliceVision/localization/rigResection_test.cpp | 2 +- src/aliceVision/matching/indMatch_test.cpp | 2 +- src/aliceVision/matching/matching_test.cpp | 2 +- src/aliceVision/matching/metric_test.cpp | 2 +- .../matchingImageCollection/geometricFilterUtils_test.cpp | 2 +- src/aliceVision/matchingImageCollection/pairBuilder_test.cpp | 2 +- src/aliceVision/multiview/affineSolver_test.cpp | 2 +- src/aliceVision/multiview/essentialFivePointSolver_test.cpp | 2 +- src/aliceVision/multiview/essentialKernelSolver_test.cpp | 2 +- src/aliceVision/multiview/fundamentalKernelSolver_test.cpp | 2 +- src/aliceVision/multiview/homographyKernelSolver_test.cpp | 2 +- .../multiview/knownRotationTranslationKernel_test.cpp | 2 +- src/aliceVision/multiview/resection/p4pfSolver_test.cpp | 2 +- src/aliceVision/multiview/resection/p5pfrSolver_test.cpp | 2 +- src/aliceVision/multiview/resection/resectionKernel_test.cpp | 2 +- .../multiview/resection/resectionLORansac_test.cpp | 2 +- .../multiview/rotationAveraging/rotationAveraging_test.cpp | 2 +- .../translationAveraging/translationAveraging_test.cpp | 2 +- .../multiview/triangulation/triangulationDLT_test.cpp | 2 +- .../multiview/triangulation/triangulation_test.cpp | 2 +- src/aliceVision/numeric/CMakeLists.txt | 4 +++- src/aliceVision/numeric/lmFunctor_test.cpp | 2 +- src/aliceVision/numeric/numeric_test.cpp | 2 +- src/aliceVision/numeric/polynomial_test.cpp | 2 +- src/aliceVision/robustEstimation/acRansac_test.cpp | 2 +- .../robustEstimation/leastMedianOfSquares_test.cpp | 2 +- src/aliceVision/robustEstimation/lineKernel_test.cpp | 2 +- src/aliceVision/robustEstimation/loRansac_test.cpp | 2 +- src/aliceVision/robustEstimation/maxConsensus_test.cpp | 2 +- src/aliceVision/robustEstimation/randSampling_test.cpp | 2 +- src/aliceVision/robustEstimation/ransac_test.cpp | 2 +- src/aliceVision/sensorDB/parseDatabase_test.cpp | 2 +- src/aliceVision/sfm/bundleAdjustment_test.cpp | 2 +- src/aliceVision/sfm/pipeline/global/globalSfM_test.cpp | 2 +- src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp | 2 +- .../sfm/pipeline/sequential/sequentialSfM_test.cpp | 2 +- src/aliceVision/sfmDataIO/alembicIO_test.cpp | 2 +- src/aliceVision/sfmDataIO/sfmDataIO_test.cpp | 2 +- src/aliceVision/stl/dynamicBitset_test.cpp | 2 +- src/aliceVision/system/CMakeLists.txt | 2 +- src/aliceVision/system/Logger.hpp | 1 - src/aliceVision/track/track_test.cpp | 2 +- src/aliceVision/voctree/kmeans_test.cpp | 2 +- src/aliceVision/voctree/vocabularyTreeBuild_test.cpp | 2 +- src/aliceVision/voctree/vocabularyTree_test.cpp | 2 +- 71 files changed, 72 insertions(+), 71 deletions(-) diff --git a/src/aliceVision/camera/pinholeBrown_test.cpp b/src/aliceVision/camera/pinholeBrown_test.cpp index 4959eb2b54..a71c8c518e 100644 --- a/src/aliceVision/camera/pinholeBrown_test.cpp +++ b/src/aliceVision/camera/pinholeBrown_test.cpp @@ -10,7 +10,7 @@ #define BOOST_TEST_MODULE pinholeBrown #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/camera/pinholeFisheye1_test.cpp b/src/aliceVision/camera/pinholeFisheye1_test.cpp index 4bdc1dae04..17ab447e16 100644 --- a/src/aliceVision/camera/pinholeFisheye1_test.cpp +++ b/src/aliceVision/camera/pinholeFisheye1_test.cpp @@ -9,7 +9,7 @@ #define BOOST_TEST_MODULE pinholeFisheye1 #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/camera/pinholeFisheye_test.cpp b/src/aliceVision/camera/pinholeFisheye_test.cpp index c42e0a0b98..615aac6c1b 100644 --- a/src/aliceVision/camera/pinholeFisheye_test.cpp +++ b/src/aliceVision/camera/pinholeFisheye_test.cpp @@ -10,7 +10,7 @@ #define BOOST_TEST_MODULE pinholeFisheye #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/camera/pinholeRadial_test.cpp b/src/aliceVision/camera/pinholeRadial_test.cpp index f7e37dba24..975d9f0632 100644 --- a/src/aliceVision/camera/pinholeRadial_test.cpp +++ b/src/aliceVision/camera/pinholeRadial_test.cpp @@ -10,7 +10,7 @@ #define BOOST_TEST_MODULE pinholeRadial #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp b/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp index e9ff5c0b3a..03e5bcfe0f 100644 --- a/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp +++ b/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp @@ -22,7 +22,7 @@ #define BOOST_TEST_MODULE GainOffsetConstraintBuilder #include -#include +#include using namespace aliceVision; using namespace aliceVision::linearProgramming; diff --git a/src/aliceVision/feature/features_test.cpp b/src/aliceVision/feature/features_test.cpp index 19cf543132..64b96b6ef6 100644 --- a/src/aliceVision/feature/features_test.cpp +++ b/src/aliceVision/feature/features_test.cpp @@ -15,7 +15,7 @@ #define BOOST_TEST_MODULE Feature #include -#include +#include using namespace std; using std::string; diff --git a/src/aliceVision/geometry/frustumIntersection_test.cpp b/src/aliceVision/geometry/frustumIntersection_test.cpp index e091884dca..7bdfee88ce 100644 --- a/src/aliceVision/geometry/frustumIntersection_test.cpp +++ b/src/aliceVision/geometry/frustumIntersection_test.cpp @@ -16,7 +16,7 @@ #define BOOST_TEST_MODULE frustumIntersection #include -#include +#include using namespace aliceVision; using namespace aliceVision::geometry; diff --git a/src/aliceVision/geometry/halfSpaceIntersection_test.cpp b/src/aliceVision/geometry/halfSpaceIntersection_test.cpp index 08d04cff02..889449b241 100644 --- a/src/aliceVision/geometry/halfSpaceIntersection_test.cpp +++ b/src/aliceVision/geometry/halfSpaceIntersection_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE halfSpaceIntersection #include -#include +#include using namespace aliceVision; using namespace aliceVision::geometry::halfPlane; diff --git a/src/aliceVision/geometry/rigidTransformation3D_test.cpp b/src/aliceVision/geometry/rigidTransformation3D_test.cpp index 1ee3edfa22..ae7cff79df 100644 --- a/src/aliceVision/geometry/rigidTransformation3D_test.cpp +++ b/src/aliceVision/geometry/rigidTransformation3D_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE rigidTransformation3D #include -#include +#include using namespace aliceVision; using namespace aliceVision::geometry; diff --git a/src/aliceVision/graph/connectedComponent_test.cpp b/src/aliceVision/graph/connectedComponent_test.cpp index d00b25a6ed..c1ba281f1f 100644 --- a/src/aliceVision/graph/connectedComponent_test.cpp +++ b/src/aliceVision/graph/connectedComponent_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE connectedComponent #include -#include +#include using namespace lemon; diff --git a/src/aliceVision/graph/triplet_test.cpp b/src/aliceVision/graph/triplet_test.cpp index 17dde788a8..4e5be4fe34 100644 --- a/src/aliceVision/graph/triplet_test.cpp +++ b/src/aliceVision/graph/triplet_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE tripletFinder #include -#include +#include using namespace aliceVision::graph; diff --git a/src/aliceVision/image/drawing_test.cpp b/src/aliceVision/image/drawing_test.cpp index 279d7fbbd7..d918f25264 100644 --- a/src/aliceVision/image/drawing_test.cpp +++ b/src/aliceVision/image/drawing_test.cpp @@ -10,7 +10,7 @@ #define BOOST_TEST_MODULE ImageDrawing #include -#include +#include using namespace aliceVision; using namespace aliceVision::image; diff --git a/src/aliceVision/image/filtering_test.cpp b/src/aliceVision/image/filtering_test.cpp index a4c8a25930..4083b46b75 100644 --- a/src/aliceVision/image/filtering_test.cpp +++ b/src/aliceVision/image/filtering_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE ImageFiltering #include -#include +#include using namespace aliceVision; using namespace aliceVision::image; diff --git a/src/aliceVision/image/image_test.cpp b/src/aliceVision/image/image_test.cpp index 9b13b3cfb7..56068d9c94 100644 --- a/src/aliceVision/image/image_test.cpp +++ b/src/aliceVision/image/image_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE Image #include -#include +#include using namespace std; using namespace aliceVision; diff --git a/src/aliceVision/image/io_test.cpp b/src/aliceVision/image/io_test.cpp index 12857952a5..eeb6cdccd9 100644 --- a/src/aliceVision/image/io_test.cpp +++ b/src/aliceVision/image/io_test.cpp @@ -11,7 +11,7 @@ #define BOOST_TEST_MODULE imageIO #include -#include +#include #include #include diff --git a/src/aliceVision/image/resampling_test.cpp b/src/aliceVision/image/resampling_test.cpp index 04e9c8ed9d..1a48513414 100644 --- a/src/aliceVision/image/resampling_test.cpp +++ b/src/aliceVision/image/resampling_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE ImageRessampling #include -#include +#include using namespace aliceVision; using namespace aliceVision::image; diff --git a/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp b/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp index b222a20036..fe8e3a1a6e 100644 --- a/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp +++ b/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE LIGHTING_ESTIMATION #include -#include +#include #include diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp index d71a7f2de5..7ec1906cd5 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE translation_averaging_globalTi_from_tijs #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTriplets_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTriplets_test.cpp index 5156c9f199..6e1936d231 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTriplets_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTriplets_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE globalTi_from_tijs_Triplets #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_robust_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_robust_test.cpp index 9098ea6228..e38d08d38d 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_robust_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_robust_test.cpp @@ -18,7 +18,7 @@ #define BOOST_TEST_MODULE ResectionLInfinityRobust #include -#include +#include using namespace aliceVision; using namespace aliceVision::robustEstimation; diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp index 098225362d..63c0ffcbc4 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp @@ -24,7 +24,7 @@ #define BOOST_TEST_MODULE ResectionLInfinity #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp index 1bea0eed2e..a6ac74ea1d 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp @@ -27,7 +27,7 @@ #define BOOST_TEST_MODULE TranslationStructureLInfinityNoisy #include -#include +#include using namespace aliceVision; diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp index 722e0090bc..f41092c55b 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp @@ -24,7 +24,7 @@ #define BOOST_TEST_MODULE TranslationStructureLInfinity #include -#include +#include using namespace aliceVision; diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_triangulation_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_triangulation_test.cpp index 7b024ca378..6cd5a693d6 100644 --- a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_triangulation_test.cpp +++ b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_triangulation_test.cpp @@ -26,7 +26,7 @@ #define BOOST_TEST_MODULE lInfinityCVTriangulation #include -#include +#include using namespace aliceVision; using namespace linearProgramming; diff --git a/src/aliceVision/linearProgramming/linearProgramming_test.cpp b/src/aliceVision/linearProgramming/linearProgramming_test.cpp index 1eadcf93e8..20102b2bb1 100644 --- a/src/aliceVision/linearProgramming/linearProgramming_test.cpp +++ b/src/aliceVision/linearProgramming/linearProgramming_test.cpp @@ -18,7 +18,7 @@ #define BOOST_TEST_MODULE linearProgramming #include -#include +#include using namespace aliceVision; using namespace aliceVision::linearProgramming; diff --git a/src/aliceVision/localization/LocalizationResult_test.cpp b/src/aliceVision/localization/LocalizationResult_test.cpp index 385e9f40ad..887526a92e 100644 --- a/src/aliceVision/localization/LocalizationResult_test.cpp +++ b/src/aliceVision/localization/LocalizationResult_test.cpp @@ -18,7 +18,7 @@ #define BOOST_TEST_MODULE LocalizationResult #include -#include +#include #include namespace fs = boost::filesystem; diff --git a/src/aliceVision/localization/rigResection_test.cpp b/src/aliceVision/localization/rigResection_test.cpp index 2a6ae9f170..1cd6b75ffc 100644 --- a/src/aliceVision/localization/rigResection_test.cpp +++ b/src/aliceVision/localization/rigResection_test.cpp @@ -19,7 +19,7 @@ #define BOOST_TEST_MODULE rigResection #include -#include +#include using namespace aliceVision; diff --git a/src/aliceVision/matching/indMatch_test.cpp b/src/aliceVision/matching/indMatch_test.cpp index 996914b24f..1cd8f00ceb 100644 --- a/src/aliceVision/matching/indMatch_test.cpp +++ b/src/aliceVision/matching/indMatch_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE IndMatch #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/matching/matching_test.cpp b/src/aliceVision/matching/matching_test.cpp index ab4b877003..de649f42fa 100644 --- a/src/aliceVision/matching/matching_test.cpp +++ b/src/aliceVision/matching/matching_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE matching #include -#include +#include using namespace std; using namespace aliceVision; diff --git a/src/aliceVision/matching/metric_test.cpp b/src/aliceVision/matching/metric_test.cpp index 45e97ba51b..9a94718f71 100644 --- a/src/aliceVision/matching/metric_test.cpp +++ b/src/aliceVision/matching/metric_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE matchingMetric #include -#include +#include using namespace std; using namespace aliceVision; diff --git a/src/aliceVision/matchingImageCollection/geometricFilterUtils_test.cpp b/src/aliceVision/matchingImageCollection/geometricFilterUtils_test.cpp index 239d4d13bb..e41e1833af 100644 --- a/src/aliceVision/matchingImageCollection/geometricFilterUtils_test.cpp +++ b/src/aliceVision/matchingImageCollection/geometricFilterUtils_test.cpp @@ -9,7 +9,7 @@ #define BOOST_TEST_MODULE matchingImageCollectionPairBuilder #include -#include +#include using namespace std; using namespace aliceVision; diff --git a/src/aliceVision/matchingImageCollection/pairBuilder_test.cpp b/src/aliceVision/matchingImageCollection/pairBuilder_test.cpp index b89843365c..32207f8655 100644 --- a/src/aliceVision/matchingImageCollection/pairBuilder_test.cpp +++ b/src/aliceVision/matchingImageCollection/pairBuilder_test.cpp @@ -16,7 +16,7 @@ #define BOOST_TEST_MODULE matchingImageCollectionPairBuilder #include -#include +#include using namespace std; using namespace aliceVision; diff --git a/src/aliceVision/multiview/affineSolver_test.cpp b/src/aliceVision/multiview/affineSolver_test.cpp index 37cc0e1a5e..7dfe9012ca 100644 --- a/src/aliceVision/multiview/affineSolver_test.cpp +++ b/src/aliceVision/multiview/affineSolver_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE multiviewAffineSolver #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/essentialFivePointSolver_test.cpp b/src/aliceVision/multiview/essentialFivePointSolver_test.cpp index fc755a7d30..7b6436177b 100644 --- a/src/aliceVision/multiview/essentialFivePointSolver_test.cpp +++ b/src/aliceVision/multiview/essentialFivePointSolver_test.cpp @@ -17,7 +17,7 @@ #define BOOST_TEST_MODULE essentialFivePointSolver #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/essentialKernelSolver_test.cpp b/src/aliceVision/multiview/essentialKernelSolver_test.cpp index 3c4fc4c9cf..1994c4cb68 100644 --- a/src/aliceVision/multiview/essentialKernelSolver_test.cpp +++ b/src/aliceVision/multiview/essentialKernelSolver_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE essentialKernelSolver #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/fundamentalKernelSolver_test.cpp b/src/aliceVision/multiview/fundamentalKernelSolver_test.cpp index ad0a71f741..5814a95df7 100644 --- a/src/aliceVision/multiview/fundamentalKernelSolver_test.cpp +++ b/src/aliceVision/multiview/fundamentalKernelSolver_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE fundamentalKernelSolver #include -#include +#include using namespace aliceVision; using namespace std; diff --git a/src/aliceVision/multiview/homographyKernelSolver_test.cpp b/src/aliceVision/multiview/homographyKernelSolver_test.cpp index 5587f8eb15..0931a69eed 100644 --- a/src/aliceVision/multiview/homographyKernelSolver_test.cpp +++ b/src/aliceVision/multiview/homographyKernelSolver_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE homographyKernelSolver #include -#include +#include #include using namespace std; diff --git a/src/aliceVision/multiview/knownRotationTranslationKernel_test.cpp b/src/aliceVision/multiview/knownRotationTranslationKernel_test.cpp index f6bbc06845..e9c75ac5e1 100644 --- a/src/aliceVision/multiview/knownRotationTranslationKernel_test.cpp +++ b/src/aliceVision/multiview/knownRotationTranslationKernel_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE knownRotationTranslationKernel #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/resection/p4pfSolver_test.cpp b/src/aliceVision/multiview/resection/p4pfSolver_test.cpp index ae1416557b..9aaf76eba4 100644 --- a/src/aliceVision/multiview/resection/p4pfSolver_test.cpp +++ b/src/aliceVision/multiview/resection/p4pfSolver_test.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include diff --git a/src/aliceVision/multiview/resection/p5pfrSolver_test.cpp b/src/aliceVision/multiview/resection/p5pfrSolver_test.cpp index 893a12e3e2..71ea473948 100644 --- a/src/aliceVision/multiview/resection/p5pfrSolver_test.cpp +++ b/src/aliceVision/multiview/resection/p5pfrSolver_test.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include diff --git a/src/aliceVision/multiview/resection/resectionKernel_test.cpp b/src/aliceVision/multiview/resection/resectionKernel_test.cpp index 8cb57d1a17..addfbd9406 100644 --- a/src/aliceVision/multiview/resection/resectionKernel_test.cpp +++ b/src/aliceVision/multiview/resection/resectionKernel_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE ResectionKernel #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/resection/resectionLORansac_test.cpp b/src/aliceVision/multiview/resection/resectionLORansac_test.cpp index 684afebeca..62d1b3b0e0 100644 --- a/src/aliceVision/multiview/resection/resectionLORansac_test.cpp +++ b/src/aliceVision/multiview/resection/resectionLORansac_test.cpp @@ -25,7 +25,7 @@ #define BOOST_TEST_MODULE ResectionLORansac #include -#include +#include using namespace aliceVision; diff --git a/src/aliceVision/multiview/rotationAveraging/rotationAveraging_test.cpp b/src/aliceVision/multiview/rotationAveraging/rotationAveraging_test.cpp index 6613d4bd6d..2094805d5f 100644 --- a/src/aliceVision/multiview/rotationAveraging/rotationAveraging_test.cpp +++ b/src/aliceVision/multiview/rotationAveraging/rotationAveraging_test.cpp @@ -19,7 +19,7 @@ #define BOOST_TEST_MODULE rotationAveraging #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/translationAveraging/translationAveraging_test.cpp b/src/aliceVision/multiview/translationAveraging/translationAveraging_test.cpp index 1cb02f1718..e30b94e2ae 100644 --- a/src/aliceVision/multiview/translationAveraging/translationAveraging_test.cpp +++ b/src/aliceVision/multiview/translationAveraging/translationAveraging_test.cpp @@ -17,7 +17,7 @@ #define BOOST_TEST_MODULE translationAveraging #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/multiview/triangulation/triangulationDLT_test.cpp b/src/aliceVision/multiview/triangulation/triangulationDLT_test.cpp index 6a609fa046..332ad37a2c 100644 --- a/src/aliceVision/multiview/triangulation/triangulationDLT_test.cpp +++ b/src/aliceVision/multiview/triangulation/triangulationDLT_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE triangulationDLT #include -#include +#include using namespace aliceVision; using namespace std; diff --git a/src/aliceVision/multiview/triangulation/triangulation_test.cpp b/src/aliceVision/multiview/triangulation/triangulation_test.cpp index 0caf484d4e..bb221e3903 100644 --- a/src/aliceVision/multiview/triangulation/triangulation_test.cpp +++ b/src/aliceVision/multiview/triangulation/triangulation_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE Triangulation #include -#include +#include #include diff --git a/src/aliceVision/numeric/CMakeLists.txt b/src/aliceVision/numeric/CMakeLists.txt index 27fa47fbd1..e15af28eb5 100644 --- a/src/aliceVision/numeric/CMakeLists.txt +++ b/src/aliceVision/numeric/CMakeLists.txt @@ -13,8 +13,10 @@ alicevision_add_library(aliceVision_numeric PUBLIC_LINKS Eigen3::Eigen Boost::boost + Boost::log + Boost::log_setup PUBLIC_DEFINITIONS - ${AV_EIGEN_DEFINITIONS} + ${AV_EIGEN_DEFINITIONS} ) # Unit tests diff --git a/src/aliceVision/numeric/lmFunctor_test.cpp b/src/aliceVision/numeric/lmFunctor_test.cpp index 0c4ca8b3fb..d54537fb19 100644 --- a/src/aliceVision/numeric/lmFunctor_test.cpp +++ b/src/aliceVision/numeric/lmFunctor_test.cpp @@ -17,7 +17,7 @@ #define BOOST_TEST_MODULE LMFunctor #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/numeric/numeric_test.cpp b/src/aliceVision/numeric/numeric_test.cpp index de82872c79..cf8a7c3991 100644 --- a/src/aliceVision/numeric/numeric_test.cpp +++ b/src/aliceVision/numeric/numeric_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE numeric #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/numeric/polynomial_test.cpp b/src/aliceVision/numeric/polynomial_test.cpp index 6509084cb7..640f545be3 100644 --- a/src/aliceVision/numeric/polynomial_test.cpp +++ b/src/aliceVision/numeric/polynomial_test.cpp @@ -11,7 +11,7 @@ #define BOOST_TEST_MODULE polynomial #include -#include +#include using namespace aliceVision; diff --git a/src/aliceVision/robustEstimation/acRansac_test.cpp b/src/aliceVision/robustEstimation/acRansac_test.cpp index 541c8b6aad..accdc57f7e 100644 --- a/src/aliceVision/robustEstimation/acRansac_test.cpp +++ b/src/aliceVision/robustEstimation/acRansac_test.cpp @@ -19,7 +19,7 @@ #define BOOST_TEST_MODULE ACRansac #include -#include +#include using namespace svg; diff --git a/src/aliceVision/robustEstimation/leastMedianOfSquares_test.cpp b/src/aliceVision/robustEstimation/leastMedianOfSquares_test.cpp index 1d939a5f80..633902845f 100644 --- a/src/aliceVision/robustEstimation/leastMedianOfSquares_test.cpp +++ b/src/aliceVision/robustEstimation/leastMedianOfSquares_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE leastMedianOfSquares #include -#include +#include using namespace aliceVision; diff --git a/src/aliceVision/robustEstimation/lineKernel_test.cpp b/src/aliceVision/robustEstimation/lineKernel_test.cpp index 500772db83..baa1df069f 100644 --- a/src/aliceVision/robustEstimation/lineKernel_test.cpp +++ b/src/aliceVision/robustEstimation/lineKernel_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE LineKernel #include -#include +#include using namespace aliceVision; using namespace aliceVision::robustEstimation; diff --git a/src/aliceVision/robustEstimation/loRansac_test.cpp b/src/aliceVision/robustEstimation/loRansac_test.cpp index 815a0f7ecb..1b08356af8 100644 --- a/src/aliceVision/robustEstimation/loRansac_test.cpp +++ b/src/aliceVision/robustEstimation/loRansac_test.cpp @@ -22,7 +22,7 @@ #define BOOST_TEST_MODULE robustEstimationLORansac #include -#include +#include using namespace aliceVision; using namespace aliceVision::robustEstimation; diff --git a/src/aliceVision/robustEstimation/maxConsensus_test.cpp b/src/aliceVision/robustEstimation/maxConsensus_test.cpp index 3a3729dd5e..850ff67ca8 100644 --- a/src/aliceVision/robustEstimation/maxConsensus_test.cpp +++ b/src/aliceVision/robustEstimation/maxConsensus_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE maxConsensus #include -#include +#include using namespace aliceVision; using namespace aliceVision::robustEstimation; diff --git a/src/aliceVision/robustEstimation/randSampling_test.cpp b/src/aliceVision/robustEstimation/randSampling_test.cpp index cd6b10a0c2..a93830d64e 100644 --- a/src/aliceVision/robustEstimation/randSampling_test.cpp +++ b/src/aliceVision/robustEstimation/randSampling_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE randSampling #include -#include +#include using namespace aliceVision; using namespace aliceVision::robustEstimation; diff --git a/src/aliceVision/robustEstimation/ransac_test.cpp b/src/aliceVision/robustEstimation/ransac_test.cpp index df603df16d..1ff343d333 100644 --- a/src/aliceVision/robustEstimation/ransac_test.cpp +++ b/src/aliceVision/robustEstimation/ransac_test.cpp @@ -16,7 +16,7 @@ #define BOOST_TEST_MODULE robustEstimationRansac #include -#include +#include using namespace aliceVision; using namespace aliceVision::robustEstimation; diff --git a/src/aliceVision/sensorDB/parseDatabase_test.cpp b/src/aliceVision/sensorDB/parseDatabase_test.cpp index 53cdb87453..a777cb678b 100644 --- a/src/aliceVision/sensorDB/parseDatabase_test.cpp +++ b/src/aliceVision/sensorDB/parseDatabase_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE parseDatabase #include -#include +#include using namespace aliceVision::sensorDB; namespace fs = boost::filesystem; diff --git a/src/aliceVision/sfm/bundleAdjustment_test.cpp b/src/aliceVision/sfm/bundleAdjustment_test.cpp index c5035f1654..795c65354e 100644 --- a/src/aliceVision/sfm/bundleAdjustment_test.cpp +++ b/src/aliceVision/sfm/bundleAdjustment_test.cpp @@ -16,7 +16,7 @@ #define BOOST_TEST_MODULE bundleAdjustment #include -#include +#include using namespace aliceVision; using namespace aliceVision::camera; diff --git a/src/aliceVision/sfm/pipeline/global/globalSfM_test.cpp b/src/aliceVision/sfm/pipeline/global/globalSfM_test.cpp index 4f50c8c116..ce170dcf8f 100644 --- a/src/aliceVision/sfm/pipeline/global/globalSfM_test.cpp +++ b/src/aliceVision/sfm/pipeline/global/globalSfM_test.cpp @@ -20,7 +20,7 @@ #define BOOST_TEST_MODULE GLOBAL_SFM #include -#include +#include using namespace aliceVision; using namespace aliceVision::camera; diff --git a/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp b/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp index cc4ddd58e9..c955654039 100644 --- a/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp +++ b/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp @@ -17,7 +17,7 @@ #define BOOST_TEST_MODULE PANORAMA_SFM #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/sfm/pipeline/sequential/sequentialSfM_test.cpp b/src/aliceVision/sfm/pipeline/sequential/sequentialSfM_test.cpp index 8124b44223..979906941b 100644 --- a/src/aliceVision/sfm/pipeline/sequential/sequentialSfM_test.cpp +++ b/src/aliceVision/sfm/pipeline/sequential/sequentialSfM_test.cpp @@ -17,7 +17,7 @@ #define BOOST_TEST_MODULE SEQUENTIAL_SFM #include -#include +#include using namespace aliceVision; using namespace aliceVision::camera; diff --git a/src/aliceVision/sfmDataIO/alembicIO_test.cpp b/src/aliceVision/sfmDataIO/alembicIO_test.cpp index 436ec459a7..a2a22f567a 100644 --- a/src/aliceVision/sfmDataIO/alembicIO_test.cpp +++ b/src/aliceVision/sfmDataIO/alembicIO_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE alembicIO #include -#include +#include #include diff --git a/src/aliceVision/sfmDataIO/sfmDataIO_test.cpp b/src/aliceVision/sfmDataIO/sfmDataIO_test.cpp index 425b129859..f18eaa4333 100644 --- a/src/aliceVision/sfmDataIO/sfmDataIO_test.cpp +++ b/src/aliceVision/sfmDataIO/sfmDataIO_test.cpp @@ -15,7 +15,7 @@ #define BOOST_TEST_MODULE sfmDataIO #include -#include +#include using namespace aliceVision; using namespace aliceVision::camera; diff --git a/src/aliceVision/stl/dynamicBitset_test.cpp b/src/aliceVision/stl/dynamicBitset_test.cpp index d1b257f377..bbb8b4240d 100644 --- a/src/aliceVision/stl/dynamicBitset_test.cpp +++ b/src/aliceVision/stl/dynamicBitset_test.cpp @@ -10,7 +10,7 @@ #define BOOST_TEST_MODULE stlDynamicBitset #include -#include +#include BOOST_AUTO_TEST_CASE(DYNAMIC_BITSET_InitAndReset_64) { diff --git a/src/aliceVision/system/CMakeLists.txt b/src/aliceVision/system/CMakeLists.txt index 87780973e7..10fc3bac75 100644 --- a/src/aliceVision/system/CMakeLists.txt +++ b/src/aliceVision/system/CMakeLists.txt @@ -21,8 +21,8 @@ alicevision_add_library(aliceVision_system SOURCES ${system_files_headers} ${system_files_sources} PUBLIC_LINKS Boost::log - Boost::thread Boost::log_setup + Boost::thread Boost::system Boost::date_time Boost::program_options diff --git a/src/aliceVision/system/Logger.hpp b/src/aliceVision/system/Logger.hpp index ee8d6a58d8..6294a7c10f 100644 --- a/src/aliceVision/system/Logger.hpp +++ b/src/aliceVision/system/Logger.hpp @@ -9,7 +9,6 @@ #include #include -#define BOOST_LOG_DYN_LINK 1 #include #include diff --git a/src/aliceVision/track/track_test.cpp b/src/aliceVision/track/track_test.cpp index ac6fc6a1a2..5f1b3a9ea9 100644 --- a/src/aliceVision/track/track_test.cpp +++ b/src/aliceVision/track/track_test.cpp @@ -14,7 +14,7 @@ #define BOOST_TEST_MODULE Track #include -#include +#include using namespace aliceVision::feature; using namespace aliceVision::track; diff --git a/src/aliceVision/voctree/kmeans_test.cpp b/src/aliceVision/voctree/kmeans_test.cpp index 9fe9e10c9f..3d255929e7 100644 --- a/src/aliceVision/voctree/kmeans_test.cpp +++ b/src/aliceVision/voctree/kmeans_test.cpp @@ -15,7 +15,7 @@ #define BOOST_TEST_MODULE kmeans #include -#include +#include BOOST_AUTO_TEST_CASE(kmeanInitializer) { diff --git a/src/aliceVision/voctree/vocabularyTreeBuild_test.cpp b/src/aliceVision/voctree/vocabularyTreeBuild_test.cpp index 8e083e64d3..1d7ca16d3f 100644 --- a/src/aliceVision/voctree/vocabularyTreeBuild_test.cpp +++ b/src/aliceVision/voctree/vocabularyTreeBuild_test.cpp @@ -16,7 +16,7 @@ #define BOOST_TEST_MODULE voctreeBuilder #include -#include +#include BOOST_AUTO_TEST_CASE(voctreeBuilder) { diff --git a/src/aliceVision/voctree/vocabularyTree_test.cpp b/src/aliceVision/voctree/vocabularyTree_test.cpp index ea8be07de0..d07055b5fd 100644 --- a/src/aliceVision/voctree/vocabularyTree_test.cpp +++ b/src/aliceVision/voctree/vocabularyTree_test.cpp @@ -13,7 +13,7 @@ #define BOOST_TEST_MODULE vocabularyTree #include -#include +#include using namespace std; using namespace aliceVision::voctree;