Cleaning up includes, fixing tbb binary include for 32 bit windows version.

2025-12-30 04:52:29 +00:00 · 2018-06-18 08:42:56 +01:00
parent cd24af000f
commit b571cc212b
15 changed files with 53 additions and 96 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,5 @@ exe/releases/OpenFace_*
 /build/
 matlab_runners/Action Unit Experiments/AU_predictions/
 lib/local/Utilities/Debug/
+lib/3rdParty/CameraEnumerator/Debug/
+lib/local/CppInerop/Debug/
--- a/lib/3rdParty/OpenBLAS/OpenBLAS.props
+++ b/lib/3rdParty/OpenBLAS/OpenBLAS.props
@@ -11,10 +11,7 @@
      <AdditionalLibraryDirectories>$(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalDependencies>libopenblas.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
+    <PreBuildEvent />
    <PreLinkEvent>
      <Command>xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)" "$(OutDir)"</Command>
    </PreLinkEvent>
--- a/lib/3rdParty/dlib/dlib.props
+++ b/lib/3rdParty/dlib/dlib.props
@@ -8,5 +8,6 @@
      <AdditionalLibraryDirectories>$(SolutionDir)lib\3rdParty\dlib\lib\$(PlatformTarget)\$(PlatformToolset)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalDependencies>dlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
+    <PreBuildEvent />
  </ItemDefinitionGroup>
 </Project>
--- a/lib/3rdParty/dlib/installation_instructions_windows.txt
+++ b/lib/3rdParty/dlib/installation_instructions_windows.txt
@@ -3,9 +3,11 @@ We are using dlib 19.13, the libraries are pre-built for convenience, they were
 For win 64 bit
 cmake -G "Visual Studio 14 2015 Win64" -DDLIB_JPEG_SUPPORT=0 -DDLIB_PNG_SUPPORT=0 -DDLIB_NO_GUI_SUPPORT=1 -DDLIB_ISO_CPP_ONLY=0 -DENABLE_ASSERTS=0 -DCMAKE_INSTALL_PREFIX=install ..
 cmake --build . --config Debug --target INSTALL
-cmake --build . --config R --target INSTALL
+cmake --build . --config Release --target INSTALL

 For win 32 bit
 cmake -G "Visual Studio 14 2015" -DDLIB_JPEG_SUPPORT=0 -DDLIB_PNG_SUPPORT=0 -DDLIB_NO_GUI_SUPPORT=1 -DDLIB_ISO_CPP_ONLY=0 -DENABLE_ASSERTS=0 -DCMAKE_INSTALL_PREFIX=install ..
 cmake --build . --config Debug --target INSTALL
-cmake --build . --config R --target INSTALL
+cmake --build . --config Release --target INSTALL
+
+Afterwards move the built libs to the right location "lib" folder and rename them accordingly
--- a/lib/local/CppInerop/CppInterop.cpp
+++ b/lib/local/CppInerop/CppInterop.cpp
@@ -32,13 +32,22 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+// Allows to overcome boost name clash stuff with C++ CLI
+#ifdef __cplusplus_cli
+#define generic __identifier(generic)
+#endif
+
 // This is the main DLL file.
+#include "GazeAnalyserInterop.h"
 #include "LandmarkDetectorInterop.h"
 #include "FaceAnalyserInterop.h"
-#include "GazeAnalyserInterop.h"
 #include "OpenCVWrappers.h"
 #include "ImageReader.h"
 #include "FaceDetectorInterop.h"
 #include "RecorderInterop.h"
 #include "VisualizerInterop.h"
-#include "SequenceReader.h"
+#include "SequenceReader.h"
+
+#ifdef __cplusplus_cli
+#undef generic
+#endif
--- a/lib/local/CppInerop/FaceAnalyserInterop.h
+++ b/lib/local/CppInerop/FaceAnalyserInterop.h
@@ -46,18 +46,13 @@

 #pragma unmanaged

+#include <opencv2/opencv.hpp>
+
 // Allows to overcome boost name clash stuff with C++ CLI
 #ifdef __cplusplus_cli
 #define generic __identifier(generic)
 #endif

-#include <opencv2/core/core.hpp>
-#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
 #include <OpenCVWrappers.h>
 #include <Face_utils.h>
 #include <FaceAnalyser.h>
@@ -71,10 +66,10 @@
 #undef generic
 #endif

-using namespace System::Collections::Generic;
-
 #pragma managed

+using namespace System::Collections::Generic;
+
 namespace FaceAnalyser_Interop {

 public ref class FaceAnalyserManaged
--- a/lib/local/CppInerop/FaceDetectorInterop.h
+++ b/lib/local/CppInerop/FaceDetectorInterop.h
@@ -38,32 +38,19 @@
 #pragma once

 // Include all the unmanaged things we need.
+#pragma unmanaged

-#include <opencv2/core/core.hpp>
-#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
-// Allows to overcome boost name clash stuff with C++ CLI
-#ifdef __cplusplus_cli
-#define generic __identifier(generic)
-#endif
-
+#undef _M_CEE
+#include <opencv2/opencv.hpp>
 #include <OpenCVWrappers.h>
-
 #include <LandmarkCoreIncludes.h>
-
-#ifdef __cplusplus_cli
-#undef generic
-#endif
-
-using namespace System::Collections::Generic;
+#define _M_CEE

 #pragma managed
+
 #include <msclr\marshal.h>
 #include <msclr\marshal_cppstd.h>
+using namespace System::Collections::Generic;

 namespace FaceDetectorInterop {

--- a/lib/local/CppInerop/GazeAnalyserInterop.h
+++ b/lib/local/CppInerop/GazeAnalyserInterop.h
@@ -47,30 +47,12 @@

 #pragma unmanaged

-#include <opencv2/core/core.hpp>
-#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
-// Allows to overcome boost name clash stuff with C++ CLI
-#ifdef __cplusplus_cli
-#define generic __identifier(generic)
-#endif
+#include <opencv2/opencv.hpp>

 #include <OpenCVWrappers.h>
 #include <LandmarkDetectorInterop.h>
 #include <GazeEstimation.h>

-// Boost stuff
-#include <filesystem.hpp>
-#include <filesystem/fstream.hpp>
-
-#ifdef __cplusplus_cli
-#undef generic
-#endif
-
 #pragma managed

 namespace GazeAnalyser_Interop {
--- a/lib/local/CppInerop/ImageReader.h
+++ b/lib/local/CppInerop/ImageReader.h
@@ -37,18 +37,13 @@

 // Include all the unmanaged things we need.

-#include <opencv2/core/core.hpp>
-#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
 #include <vector>
 #include <set>

 #include <OpenCVWrappers.h>

-#include "ImageCapture.h"
+#include <ImageCapture.h>

 #pragma managed

--- a/lib/local/CppInerop/LandmarkDetectorInterop.h
+++ b/lib/local/CppInerop/LandmarkDetectorInterop.h
@@ -45,29 +45,16 @@

 // Include all the unmanaged things we need.

-#include <opencv2/core/core.hpp>
-#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-
-// Allows to overcome boost name clash stuff with C++ CLI
-#ifdef __cplusplus_cli
-#define generic __identifier(generic)
-#endif
+#include <opencv2/opencv.hpp>

 #include <OpenCVWrappers.h>

+#undef _M_CEE
 #include <LandmarkCoreIncludes.h>
-
 #include <Face_utils.h>
 #include <FaceAnalyser.h>
 #include <VisualizationUtils.h>
-
-#ifdef __cplusplus_cli
-#undef generic
-#endif
+#define _M_CEE

 using namespace System::Collections::Generic;

--- a/lib/local/CppInerop/OpenCVWrappers.h
+++ b/lib/local/CppInerop/OpenCVWrappers.h
@@ -42,8 +42,8 @@

 #pragma unmanaged

-#include "cv.h"
-#include "highgui.h"
+#include <cv.h>
+#include <highgui.h>

 #include <opencv2/videoio/videoio.hpp>  // Video write
 #include <opencv2/videoio/videoio_c.h>  // Video write
--- a/lib/local/CppInerop/RecorderInterop.h
+++ b/lib/local/CppInerop/RecorderInterop.h
@@ -39,13 +39,16 @@

 // Include all the unmanaged things we need.

-#include "RecorderOpenFace.h"
+#include <RecorderOpenFace.h>
+#include <OpenCVWrappers.h>

 #pragma managed

 #include <msclr\marshal.h>
 #include <msclr\marshal_cppstd.h>

+using namespace System::Collections::Generic;
+
 namespace UtilitiesOF {

 	public ref class RecorderOpenFaceParameters
--- a/lib/local/CppInerop/SequenceReader.h
+++ b/lib/local/CppInerop/SequenceReader.h
@@ -37,27 +37,23 @@

 // Include all the unmanaged things we need.

-#include <opencv2/core/core.hpp>
-#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/opencv.hpp>
 #include <vector>
 #include <set>
+#include <string>

 #include <OpenCVWrappers.h>
 #include <ImageReader.h>
-
-#include "DeviceEnumerator.h"
-
-#include "SequenceCapture.h"
+#include <DeviceEnumerator.h>
+#include <SequenceCapture.h>

 #pragma managed

 #include <msclr\marshal.h>
 #include <msclr\marshal_cppstd.h>

+using namespace System::Collections::Generic;
+
 namespace UtilitiesOF {


@@ -271,7 +267,7 @@ namespace UtilitiesOF {
 	
 	private:
 		// Static methods for listing cameras and their resolutions
-		static void split(const std::string &s, char delim, std::vector<string> &elems) {
+		static void split(const std::string &s, char delim, std::vector<std::string> &elems) {
 			std::stringstream ss;
 			ss.str(s);
 			std::string item;
@@ -299,7 +295,7 @@ namespace UtilitiesOF {
 				auto resolutions = gcnew System::Collections::Generic::List<System::Tuple<int, int>^>();
 				for (size_t r_idx = 0; r_idx < resolution_list.size(); r_idx++)
 				{
-					string res = resolution_list[r_idx]["res"];
+					std::string res = resolution_list[r_idx]["res"];

 					std::vector<std::string> elems;
 					split(res, 'x', elems);
@@ -329,7 +325,7 @@ namespace UtilitiesOF {
 				auto resolutions = camera_list[name_m];
 				for (int j = 0; j < resolutions->Count; j++)
 				{
-					stringstream ss;
+					std::stringstream ss;
 					ss << resolutions[j]->Item1 << "x" << resolutions[j]->Item2;

 					fs << "{:" << "res" << ss.str();
--- a/lib/local/CppInerop/VisualizerInterop.h
+++ b/lib/local/CppInerop/VisualizerInterop.h
@@ -37,7 +37,8 @@

 // Include all the unmanaged things we need.

-#include "Visualizer.h"
+#include <Visualizer.h>
+#include <OpenCVWrappers.h>

 #pragma managed

--- a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj
+++ b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj
@@ -56,8 +56,8 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\..\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\3rdParty\boost\boost_d.props" />
    <Import Project="..\..\3rdParty\tbb\tbb_d.props" />
+    <Import Project="..\..\3rdParty\boost\boost_d.props" />
    <Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
    <Import Project="..\..\3rdParty\OpenCV3.4\openCV3.4.props" />
  </ImportGroup>