[mousetrap/ng] BugFix
- From: Flavio Percoco <flaper src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mousetrap/ng] BugFix
- Date: Thu, 5 Nov 2009 21:51:06 +0000 (UTC)
commit 45f01e0fc5144b8f8ef856d2d492cb0b17f8bb47
Author: Flavio Percoco Premoli <flaper87 gmail com>
Date: Fri Nov 6 00:06:24 2009 +0100
BugFix
src/mousetrap/ocvfw/dev/MtpCamera.cpp | 4 ++--
src/mousetrap/ocvfw/dev/MtpCapture.cpp | 6 ++----
src/mousetrap/ocvfw/dev/MtpCapture.h | 6 +++---
src/mousetrap/ocvfw/dev/PyMtpCapture.cpp | 5 +++--
4 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/src/mousetrap/ocvfw/dev/MtpCamera.cpp b/src/mousetrap/ocvfw/dev/MtpCamera.cpp
index 1529f93..1029df4 100644
--- a/src/mousetrap/ocvfw/dev/MtpCamera.cpp
+++ b/src/mousetrap/ocvfw/dev/MtpCamera.cpp
@@ -19,8 +19,6 @@
* along with Ocvfw. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "cv.h"
-#include "highgui.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,6 +29,8 @@
#include <time.h>
#include <ctype.h>
+#include "cv.h"
+#include "highgui.h"
#include "MtpCamera.h"
static IplImage * orginalFrame=0;
diff --git a/src/mousetrap/ocvfw/dev/MtpCapture.cpp b/src/mousetrap/ocvfw/dev/MtpCapture.cpp
index 6e129af..6d7972b 100644
--- a/src/mousetrap/ocvfw/dev/MtpCapture.cpp
+++ b/src/mousetrap/ocvfw/dev/MtpCapture.cpp
@@ -20,14 +20,12 @@
*/
+#include <stdio.h>
+#include <glibmm.h>
#include "cv.h"
#include "highgui.h"
#include "MtpCamera.h"
-
-#include <stdio.h>
-#include <glibmm.h>
-
#include "MtpCapture.h"
MtpCapture::MtpCapture() {
diff --git a/src/mousetrap/ocvfw/dev/MtpCapture.h b/src/mousetrap/ocvfw/dev/MtpCapture.h
index cff893a..49704fd 100644
--- a/src/mousetrap/ocvfw/dev/MtpCapture.h
+++ b/src/mousetrap/ocvfw/dev/MtpCapture.h
@@ -21,12 +21,12 @@
/** @file */
-#include "cv.h"
-#include "highgui.h"
-
#include <stdio.h>
#include <glibmm.h>
+
+#include "cv.h"
+#include "highgui.h"
#include "MtpCamera.h"
/**
diff --git a/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp b/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp
index c5f753d..2653a4d 100644
--- a/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp
+++ b/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp
@@ -18,12 +18,13 @@
* along with Ocvfw. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "Python.h"
+#include "structmember.h"
+
#include "cv.h"
#include "highgui.h"
-#include "structmember.h"
-
#include "MtpCapture.h"
static MtpCapture cap;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]