Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 0 insertions, 18 deletions

diff --git a/FTNoIR_Tracker_PT/frame_observer.cpp b/FTNoIR_Tracker_PT/frame_observer.cpp
deleted file mode 100644
index 281f3d57..00000000
--- a/FTNoIR_Tracker_PT/frame_observer.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 2013 Patrick Ruoff

- *

- * Permission to use, copy, modify, and/or distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- */

-

-#include "frame_observer.h"

-

-//-----------------------------------------------------------------------------

-FrameProvider::~FrameProvider()

-{

-	QMutexLocker lock(&observer_mutex);

-    for (std::set<FrameObserver*>::iterator iter=frame_observers.begin(); iter!=frame_observers.end(); ++iter)

-	{

-		(*iter)->on_frame_provider_destroy();

-	}

-}