Merge branch 'personal/svedimon/color-finder' into sick-day

[eurobot/public.git] / src / camera / color-finder / main / revue.cpp

diff --git a/src/camera/color-finder/main/revue.cpp b/src/camera/color-finder/main/revue.cpp
index ad6918d9efbc3e5da43e3b936d3e003bfbf148d3..9ecd9c1bf036d8bc729e08c560290413da3d09da 100644 (file)
--- a/src/camera/color-finder/main/revue.cpp
+++ b/src/camera/color-finder/main/revue.cpp
@@ -1,6 +1,10 @@
 #include <stdlib.h>
 #include <CCamera.h>
+
+#ifdef __i386__
 #include <CGui.h>
+#endif
+
 #include <CRobot.h>
 #include <CTimer.h>
 #include <CRecognition.h>
@@ -8,7 +12,6 @@
 
 extern "C" {
 #include <roboorte_robottype.h>
-#include <robot.h>
 #include "../control/CRecognition.h"
 }
 
@@ -17,17 +20,22 @@ int numSaved = 0;
 bool stop = false;
 bool cp = true;
 CCamera* camera;
+
+#ifdef __i386__
 CGui* gui;
-CRawImage *image;
 SDL_Event event;
+#endif
+
+CRawImage *image;
+
 //CRobot* robot;
 CRecognition *recognition;
 //SRobotCommand command;
 SPixelPosition meanPosition;
 bool move = false;
-Uint8 lastKeys[10000];
+unsigned char lastKeys[10000];
 int keyNumber = 1000;
-Uint8 *keys = NULL;
+unsigned char *keys = NULL;
 
 unsigned char color [3];
 unsigned char* pix = NULL;
@@ -259,7 +267,9 @@ int main(int argc,char* argv[])
        delete recognition;
        //delete robot;
        delete image;
+#ifdef __i386__
        delete gui;
+#endif
        delete camera;
 
        ret = robottype_roboorte_destroy(&orte);