From 097d01fd3d17f19cc55ca505680d4d3e7f2f6086 Mon Sep 17 00:00:00 2001
From: Tadas Baltrusaitis <tadyla@gmail.com>
Date: Sun, 6 May 2018 20:46:18 +0100
Subject: [PATCH] Cleaning up includes. removing some C++ compilation warnings
 coming from dlib.

---
 exe/FaceLandmarkImg/FaceLandmarkImg.cpp          | 16 ++--------------
 exe/FaceLandmarkVid/FaceLandmarkVid.cpp          | 13 -------------
 exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user |  3 +--
 .../FaceLandmarkVidMulti.cpp                     |  9 ---------
 exe/FeatureExtraction/FeatureExtraction.cpp      | 15 ---------------
 .../dlib/image_processing/shape_predictor.h      |  2 +-
 lib/local/Utilities/src/Visualizer.cpp           | 16 ++++++++--------
 7 files changed, 12 insertions(+), 62 deletions(-)

diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp
index 869c7b7c..8d3a1f34 100644
--- a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp
+++ b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp
@@ -33,22 +33,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // FaceLandmarkImg.cpp : Defines the entry point for the console application for detecting landmarks in images.
 
-#include "LandmarkCoreIncludes.h"
-
-// System includes
-#include <fstream>
-
-// OpenCV includes
-#include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc.hpp>
-
-// Boost includes
-#include <filesystem.hpp>
-#include <filesystem/fstream.hpp>
-
 #include <dlib/image_processing/frontal_face_detector.h>
 
+#include "LandmarkCoreIncludes.h"
+
 #include <tbb/tbb.h>
 
 #include <FaceAnalyser.h>
diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp
index 41bcd0e8..4599931e 100644
--- a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp
+++ b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp
@@ -37,23 +37,10 @@
 #include "LandmarkCoreIncludes.h"
 #include "GazeEstimation.h"
 
-#include <fstream>
-#include <sstream>
-
-// OpenCV includes
-#include <opencv2/videoio/videoio.hpp>  // Video write
-#include <opencv2/videoio/videoio_c.h>  // Video write
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
 #include <SequenceCapture.h>
 #include <Visualizer.h>
 #include <VisualizationUtils.h>
 
-// Boost includes
-#include <filesystem.hpp>
-#include <filesystem/fstream.hpp>
-
 #define INFO_STREAM( stream ) \
 std::cout << stream << std::endl
 
diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user
index 950288a8..b6d80708 100644
--- a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user
+++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user
@@ -16,8 +16,7 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-device 0</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
index b713ad7f..2ab0b2ac 100644
--- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
+++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
@@ -44,15 +44,6 @@
 #include <GazeEstimation.h>
 #include <FaceAnalyser.h>
 
-#include <fstream>
-#include <sstream>
-
-// OpenCV includes
-#include <opencv2/videoio/videoio.hpp>  // Video write
-#include <opencv2/videoio/videoio_c.h>  // Video write
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
 #define INFO_STREAM( stream ) \
 std::cout << stream << std::endl
 
diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp
index 26ae945c..ab9ac1db 100644
--- a/exe/FeatureExtraction/FeatureExtraction.cpp
+++ b/exe/FeatureExtraction/FeatureExtraction.cpp
@@ -35,21 +35,6 @@
 
 // FeatureExtraction.cpp : Defines the entry point for the feature extraction console application.
 
-// System includes
-#include <fstream>
-#include <sstream>
-
-// OpenCV includes
-#include <opencv2/videoio/videoio.hpp>  // Video write
-#include <opencv2/videoio/videoio_c.h>  // Video write
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
-// Boost includes
-#include <filesystem.hpp>
-#include <filesystem/fstream.hpp>
-#include <boost/algorithm/string.hpp>
-
 // Local includes
 #include "LandmarkCoreIncludes.h"
 
diff --git a/lib/3rdParty/dlib/include/dlib/image_processing/shape_predictor.h b/lib/3rdParty/dlib/include/dlib/image_processing/shape_predictor.h
index 748640d5..98953920 100644
--- a/lib/3rdParty/dlib/include/dlib/image_processing/shape_predictor.h
+++ b/lib/3rdParty/dlib/include/dlib/image_processing/shape_predictor.h
@@ -707,7 +707,7 @@ namespace dlib
         {
             using namespace impl;
             std::deque<std::pair<unsigned long, unsigned long> > parts;
-            parts.push_back(std::make_pair(0, samples.size()));
+			parts.push_back(std::make_pair((unsigned long)0, (unsigned long)samples.size()));
 
             impl::regression_tree tree;
 
diff --git a/lib/local/Utilities/src/Visualizer.cpp b/lib/local/Utilities/src/Visualizer.cpp
index f3f7516e..8fb4e6be 100644
--- a/lib/local/Utilities/src/Visualizer.cpp
+++ b/lib/local/Utilities/src/Visualizer.cpp
@@ -84,26 +84,26 @@ Visualizer::Visualizer(std::vector<std::string> arguments)
 	{
 		if (arguments[i].compare("-verbose") == 0)
 		{
-			vis_track = true;
-			vis_align = true;
-			vis_hog = true;
-			vis_aus = true;
+			this->vis_track = true;
+			this->vis_align = true;
+			this->vis_hog = true;
+			this->vis_aus = true;
 		}
 		else if (arguments[i].compare("-vis-align") == 0)
 		{
-			vis_align = true;
+			this->vis_align = true;
 		}
 		else if (arguments[i].compare("-vis-hog") == 0)
 		{
-			vis_hog = true;
+			this->vis_hog = true;
 		}
 		else if (arguments[i].compare("-vis-track") == 0)
 		{
-			vis_track = true;
+			this->vis_track = true;
 		}
 		else if (arguments[i].compare("-vis-aus") == 0)
 		{
-			vis_aus = true;
+			this->vis_aus = true;
 		}
 	}