Merge commit 'escuela'

.gitignore

@@ -29,7 +29,10 @@ xobundle/fc11/*
 
 # ignore auto-generated dependency files
 *.d
-
+
+# ignorar binarios y autogenerados de mouseCam
+mouseCam.activity/bin/mouse
+mouseCam.activity/MANIFEST
 
 # links pa el chroot
 usr

ARToolkit/lib/SRC/VideoGStreamer/Makefile

@@ -7,7 +7,7 @@ LIB_DIR = ../..
 #  compiler
 #
 CC=cc
-CFLAG= $(CFLAG_CROSS) -fpic -O -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -g -I$(INC_DIR)
+CFLAG= $(CFLAG_CROSS) -fpic -O -pthread -I/usr/include/gstreamer-0.10 `pkg-config --cflags glib-2.0` -I/usr/include/libxml2 -I/usr/X11R6/include -g -I$(INC_DIR)
 #
 # For making the library
 #

Biblioteca PUI/Makefile

@@ -39,10 +39,15 @@ OBJS =
 HEADDERS =
 
 all: Pui.o Funciones.o cvUtilities.o lib_artoolkit
+
 #(XO) all: Pui.o TimeUtils.o OpenCVCamera.o Funciones.o UtilidadesSDL.o cvUtilities.o Utilidades.o ProcesamientoImagenRangosCV ProcesamientoImagenRangosMemoria ProcesamientoImagenRangosMemoriaEstatica findCirclesTestParaCalibracion histogramasEnROI
 
 Pui.o: $(SRC_DIR)/Pui.cpp cvUtilities.o Funciones.o TimeUtils.o
+ifdef GLUT_HABILITADO
 	g++ -c $(CFLAG) -DGLUT_HABILITADO=-1 $(SRC_DIR)/Pui.cpp
+else 
+	g++ -c $(CFLAG) $(SRC_DIR)/Pui.cpp
+endif
 
 TimeUtils.o: $(SRC_DIR)/TimeUtils.cpp
 	g++ -c $(CFLAG) $(SRC_DIR)/TimeUtils.cpp

Biblioteca PUI/README.TXT

@@ -0,0 +1 @@
+Si se desea compilar la bibliotca PUI de forma de habilitar el GLUT debe realizarse el make con el parametro "GLUT_HABILITADO=-1" (sin comillas)

Biblioteca PUI/samples/c++/Makefile

@@ -42,9 +42,6 @@ $(BIN_DIR)/TocarAnimalesPUI: TocarAnimalesPUI.o
 $(BIN_DIR)/MostrarAnimalesPUI: MostrarAnimalesPUI.o
 	g++ -o $(BIN_DIR)/MostrarAnimalesPUI $(LIB_DIR_UTIL)/cvUtilities.o $(LIB_DIR_UTIL)/Funciones.o UtilidadesSDL.o $(LIB_DIR_UTIL)/Pui.o MostrarAnimalesPUI.o $(OBJS) $(LDFLAG) $(LIBS)
 
-Renata.o: Renata.cpp 
-	g++ -c  $(CFLAG) Renata.cpp
-
 CalibradorColorOO.o: CalibradorColorOO.cpp 
 	g++ -c  $(CFLAG) CalibradorColorOO.cpp
 

Biblioteca PUI/samples/c++/UtilidadesSDL.h

@@ -6,11 +6,11 @@
  */
 #ifndef UTILIDADESSDL_H_INCLUDED
 #define UTILIDADESSDL_H_INCLUDED
-#include <SDL/SDL_mixer.h>
+#include <SDL/SDL_mixer.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_gfxPrimitives.h>
 
-#define MAX_IMAGENES 30
+#define MAX_IMAGENES 30
 
 int initSDL(int width, int height);
 int PlayImage(char* image, char* leyenda, int flip);

MouseCam.activity/COPYING

@@ -0,0 +1,20 @@
+Copyright (c) 2011, fing, Udelar, Uruguay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+