[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkface] libkface: apply patch from Ananta to compile against OpenCV 2.4.5
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2013-05-31 17:42:17
Message-ID: 20130531174217.77E8EA6067 () git ! kde ! org
[Download RAW message or body]

Git commit 886ff6f380030fd90b1aacc29c4cc77832e2701e by Gilles Caulier.
Committed on 31/05/2013 at 19:41.
Pushed by cgilles into branch 'master'.

apply patch from Ananta to compile against OpenCV 2.4.5

M  +3    -1    libkface/database/trainingdb.cpp
M  +5    -5    libkface/facedetector.cpp
M  +4    -2    libkface/recognitiondatabase.cpp

http://commits.kde.org/libkface/886ff6f380030fd90b1aacc29c4cc77832e2701e

diff --git a/libkface/database/trainingdb.cpp b/libkface/database/trainingdb.cpp
index f721ed1..d4ab640 100755
--- a/libkface/database/trainingdb.cpp
+++ b/libkface/database/trainingdb.cpp
@@ -19,6 +19,9 @@
  *
  * ============================================================ */
 
+// OpenCV includes need to show up before Qt includes
+#include "lbphfacemodel.h"
+
 #include "trainingdb.h"
 
 // KDE includes
@@ -28,7 +31,6 @@
 // Local includes
 
 #include "databasecorebackend.h"
-#include "lbphfacemodel.h"
 
 namespace KFaceIface
 {
diff --git a/libkface/facedetector.cpp b/libkface/facedetector.cpp
index def569d..7a5055a 100644
--- a/libkface/facedetector.cpp
+++ b/libkface/facedetector.cpp
@@ -23,6 +23,11 @@
  *
  * ============================================================ */
 
+// OpenCV includes need to show up before Qt includes
+#include "detection/opencvfacedetector.h"
+
+#include "facedetector.h"
+
 // Qt includes
 
 #include <QSharedData>
@@ -32,11 +37,6 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-// Local includes
-
-#include "detection/opencvfacedetector.h"
-#include "facedetector.h"
-
 namespace KFaceIface
 {
 
diff --git a/libkface/recognitiondatabase.cpp b/libkface/recognitiondatabase.cpp
index 108290d..cbad570 100644
--- a/libkface/recognitiondatabase.cpp
+++ b/libkface/recognitiondatabase.cpp
@@ -27,6 +27,10 @@
  *
  * ============================================================ */
 
+// OpenCV includes need to show up before Qt includes
+#include "recognition-opentld/opentldfacerecognizer.h"
+#include "recognition-opencv-lbph/opencvlbphfacerecognizer.h"
+
 #include "recognitiondatabase.h"
 
 // Qt includes
@@ -47,8 +51,6 @@
 #include "databaseaccess.h"
 #include "databaseoperationgroup.h"
 #include "databaseparameters.h"
-#include "recognition-opentld/opentldfacerecognizer.h"
-#include "recognition-opencv-lbph/opencvlbphfacerecognizer.h"
 #include "trainingdb.h"
 #include "version.h"
 
[prev in list] [next in list] [prev in thread] [next in thread]