Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 35 insertions, 35 deletions

diff --git a/faceapi/lock.h b/faceapi/lock.h
index efe38605..bb095675 100644
--- a/faceapi/lock.h
+++ b/faceapi/lock.h
@@ -1,35 +1,35 @@
-#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

+#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