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, 46 insertions, 46 deletions

diff --git a/faceapi/mutex.h b/faceapi/mutex.h
index a4f84705..b1a013e8 100644
--- a/faceapi/mutex.h
+++ b/faceapi/mutex.h
@@ -1,46 +1,46 @@
-#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

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