Patch for AliceVision integration in RTAB-Map

alice_vision_eigen.patch

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ea43b504..b86462767 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -334,8 +334,8 @@ if(Eigen3_FOUND OR EIGEN3_FOUND)
   # message(FATAL_ERROR "EIGEN_INCLUDE_DIR: ${EIGEN_INCLUDE_DIR}")
   include_directories(${EIGEN_INCLUDE_DIR})
   # See https://eigen.tuxfamily.org/dox/group__TopicUnalignedArrayAssert.html
-  add_definitions("-DEIGEN_DONT_ALIGN_STATICALLY=1")
-  add_definitions("-DEIGEN_DONT_VECTORIZE=1")
+  #add_definitions("-DEIGEN_DONT_ALIGN_STATICALLY=1")
+  #add_definitions("-DEIGEN_DONT_VECTORIZE=1")
 else()
   message(FATAL_ERROR " EIGEN NOT FOUND. EIGEN_INCLUDE_DIR: ${EIGEN_INCLUDE_DIR}")
 endif()
diff --git a/src/aliceVision/stl/FlatMap.hpp b/src/aliceVision/stl/FlatMap.hpp
index 9cedf758b..913d164ce 100644
--- a/src/aliceVision/stl/FlatMap.hpp
+++ b/src/aliceVision/stl/FlatMap.hpp
@@ -8,12 +8,13 @@
 #pragma once
 
 #include <boost/container/flat_map.hpp>
+#include <Eigen/Core>
 
 namespace stl
 {
   template <class Key
          ,class T
          ,class Compare = std::less<Key>
-         ,class Allocator = std::allocator<std::pair<Key, T> > >
+         ,class Allocator = Eigen::aligned_allocator<std::pair<Key, T> > >
   using flat_map = boost::container::flat_map<Key, T, Compare, Allocator>;
 }
diff --git a/src/software/convert/main_convertLDRToHDR.cpp b/src/software/convert/main_convertLDRToHDR.cpp
index 68204b615..743fd0531 100644
--- a/src/software/convert/main_convertLDRToHDR.cpp
+++ b/src/software/convert/main_convertLDRToHDR.cpp
@@ -288,7 +288,7 @@ void recoverSourceImage(const image::Image<image::RGBfColor>& hdrImage, hdr::rgb
     float offset[3];
     for(int i=0; i<3; ++i)
         offset[i] = std::abs(meanRecovered[i] - meanVal[i]);
-    ALICEVISION_LOG_INFO("Offset between target source image and recovered from hdr = " << offset);
+    //ALICEVISION_LOG_INFO("Offset between target source image and recovered from hdr = " << offset);
 }