diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aa031c5986..099f139d41 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -125,6 +125,10 @@ if(WIN32) endif() endif() +# Avoids deprecation warning caused by internals of json_parser. This is properly fixed in +# Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e +add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS=1) + # Folders set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "_CMakePredefinedTargets") diff --git a/src/aliceVision/camera/distortion_test.cpp b/src/aliceVision/camera/distortion_test.cpp index d4a5fad20e..9302d14f68 100644 --- a/src/aliceVision/camera/distortion_test.cpp +++ b/src/aliceVision/camera/distortion_test.cpp @@ -12,7 +12,7 @@ #define BOOST_TEST_MODULE distortion #include -#include +#include #include using namespace aliceVision; diff --git a/src/aliceVision/feature/apriltag/ImageDescriber_APRILTAG.cpp b/src/aliceVision/feature/apriltag/ImageDescriber_APRILTAG.cpp index 96f7be0681..cf083eca1f 100644 --- a/src/aliceVision/feature/apriltag/ImageDescriber_APRILTAG.cpp +++ b/src/aliceVision/feature/apriltag/ImageDescriber_APRILTAG.cpp @@ -80,7 +80,7 @@ bool ImageDescriber_APRILTAG::describe(const image::Image& image, ((tl[0]*br[1] - tl[1]*br[0]) * (bl[1]-tr[1]) - (tl[1]-br[1]) * (bl[0]*tr[1] - bl[1]*tr[0])) / denominator ); Vec2 points[5] = { center, tl, bl, br, tr }; - std::size_t indices[5] = { det->id, 30 + det->id, 60 + det->id, 90 + det->id, 120 + det->id}; + int indices[5] = { det->id, 30 + det->id, 60 + det->id, 90 + det->id, 120 + det->id}; // compute scale from max side length and diagonals (divided by sqare root of 2): const double scale = 0.5 * std::max({(tl-bl).norm(), (bl-br).norm(), (br-tr).norm(), (tr-tl).norm(), 0.707*(tl-br).norm(), 0.707*(tr-bl).norm()}); ALICEVISION_LOG_DEBUG(" New AprilTag: Id " << det->id << " ; Center location ( " << center[0] << " , " << center[1] << " ) ; Scale " << scale); diff --git a/src/dependencies/flann/src/cpp/flann/mpi/server.h b/src/dependencies/flann/src/cpp/flann/mpi/server.h index 2caab435c3..e8ccb01a2b 100644 --- a/src/dependencies/flann/src/cpp/flann/mpi/server.h +++ b/src/dependencies/flann/src/cpp/flann/mpi/server.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include