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, 35 deletions

diff --git a/faceapi/lock.h b/faceapi/lock.h
deleted file mode 100644
index efe38605..00000000
--- a/faceapi/lock.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef SM_API_TESTAPPCONSOLE_LOCK_H

-#define SM_API_TESTAPPCONSOLE_LOCK_H

-

-#include "mutex.h"

-

-namespace sm

-{

-    namespace faceapi

-    {

-        namespace samplecode

-        {

-            // A very simple scoped-lock class for sample code purposes. 

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

-            class Lock

-            {

-            public:

-                Lock(const Mutex &mutex): _mutex(mutex)

-                {

-                    _mutex.lock();

-                }

-                ~Lock()

-                {

-                    _mutex.unlock();

-                }

-            private:

-                // Noncopyable

-                Lock(const Lock &);

-                Lock &operator=(const Lock &);

-            private:

-                const Mutex &_mutex;

-            };

-        }

-    }

-}

-#endif