Merge branch 'infinitam_v3' of https://github.com/victorprad/InfiniTA…

…M_private into v3_libroyale
yun-li · Jan 23, 2017 · e3fb51d · e3fb51d
2 parents ba32068 + f0caff2
commit e3fb51d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/InfiniTAM/CMakeLists.txt b/InfiniTAM/CMakeLists.txt
@@ -39,8 +39,8 @@ ENDIF()
 ######################
 
 ADD_SUBDIRECTORY(Apps)
+ADD_SUBDIRECTORY(FernRelocLib)
 ADD_SUBDIRECTORY(InputSource)
 ADD_SUBDIRECTORY(ITMLib)
 ADD_SUBDIRECTORY(MiniSlamGraphLib)
 ADD_SUBDIRECTORY(ORUtils)
-ADD_SUBDIRECTORY(FernRelocLib)
diff --git a/InfiniTAM/FernRelocLib/PixelUtils.h b/InfiniTAM/FernRelocLib/PixelUtils.h
@@ -47,7 +47,7 @@ namespace FernRelocLib
 		}
 	}
 
-	inline void filterSeparable_x(const ORUtils::Image< ORUtils::Vector4<unsigned char> > *input, ORUtils::Image<ORUtils::Vector4<unsigned char>> *output, int masksize, const float *coeff)
+	inline void filterSeparable_x(const ORUtils::Image< ORUtils::Vector4<unsigned char> > *input, ORUtils::Image<ORUtils::Vector4<unsigned char> > *output, int masksize, const float *coeff)
 	{
 		int s2 = masksize / 2;
 		ORUtils::Vector2<int> imgSize = input->noDims;
@@ -118,7 +118,7 @@ namespace FernRelocLib
 		}
 	}
 
-	inline void filterSeparable_y(const ORUtils::Image< ORUtils::Vector4<unsigned char> > *input, ORUtils::Image<ORUtils::Vector4<unsigned char>> *output, int masksize, const float *coeff)
+	inline void filterSeparable_y(const ORUtils::Image< ORUtils::Vector4<unsigned char> > *input, ORUtils::Image<ORUtils::Vector4<unsigned char> > *output, int masksize, const float *coeff)
 	{
 		int s2 = masksize / 2;
 		ORUtils::Vector2<int> imgSize = input->noDims;
@@ -198,7 +198,7 @@ namespace FernRelocLib
 		}
 	}
 
-	inline void filterSubsample(const ORUtils::Image< ORUtils::Vector4<unsigned char> > *input, ORUtils::Image<ORUtils::Vector4<unsigned char>> *output) {
+	inline void filterSubsample(const ORUtils::Image< ORUtils::Vector4<unsigned char> > *input, ORUtils::Image<ORUtils::Vector4<unsigned char> > *output) {
 		ORUtils::Vector2<int> imgSize_in = input->noDims;
 		ORUtils::Vector2<int> imgSize_out(imgSize_in.x / 2, imgSize_in.y / 2);
 		output->ChangeDims(imgSize_out, true);

diff --git a/InfiniTAM/FernRelocLib/Relocaliser.h b/InfiniTAM/FernRelocLib/Relocaliser.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <fstream>
+
 #include "FernConservatory.h"
 #include "RelocDatabase.h"
 #include "PoseDatabase.h"