Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 0 insertions, 46 deletions

diff --git a/faceapi/mutex.h b/faceapi/mutex.h
deleted file mode 100644
index a4f84705..00000000
--- a/faceapi/mutex.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef SM_API_TESTAPPCONSOLE_MUTEX_H

-#define SM_API_TESTAPPCONSOLE_MUTEX_H

-

-#include <exception>

-

-namespace sm

-{

-    namespace faceapi

-    {

-        namespace samplecode

-        {

-            // A very simple mutex class for sample code purposes. 

-            // It is recommended that you use the boost threads library.

-            class Mutex

-            {

-            public:

-                Mutex()

-                {

-                    if (!InitializeCriticalSectionAndSpinCount(&_cs,0x80000400)) 

-                    {

-                        throw std::exception();

-                    }

-                }

-                ~Mutex()

-                {

-                    DeleteCriticalSection(&_cs);

-                }

-                void lock() const

-                {

-                    EnterCriticalSection(&_cs); 

-                }

-                void unlock() const

-                {

-                    LeaveCriticalSection(&_cs); 

-                }

-            private:

-                // Noncopyable

-                Mutex(const Mutex &);

-                Mutex &operator=(const Mutex &);

-            private:

-                mutable CRITICAL_SECTION _cs;

-            };

-        }

-    }

-}

-#endif