From b1e2fca3f9f9e9c1d7a9f967fa52d98883b894b0 Mon Sep 17 00:00:00 2001
From: steffen <steffen>
Date: Thu, 14 Mar 2013 21:43:55 +0000
Subject: [PATCH] color is nowalways a pointer.

---
 android/jni/Android.mk    | 2 +-
 android/jni/android_gfx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 0ed5a1e..9e1f5e7 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -77,7 +77,7 @@ LOCAL_SRC_FILES := \
 		mapsys/map_webload.c mapsys/map_searchhash.c\
 		mapsys/map.c mapsys/map_loadsave.c mapsys/map_way.c \
 		gui/gui.c gui/gui_button.c gui/gui_entry.c gui/gui_image.c gui/gui_label.c \
-		gui/gui_list.c gui/gui_window.c gui\gui_softkeyboard.c gui\gui_checkbox.c \
+		gui/gui_list.c gui/gui_window.c gui/gui_softkeyboard.c gui/gui_checkbox.c \
 		draw/draw.c draw/draw_favorites.c draw/draw_gps.c draw/draw_gui.c draw/draw_route.c \
 		main/favorites.c main/gui_buttons.c main/gui_mainmenu.c main/guiw_gpsfile.c \
 		main/main.c main/routing.c main/gps.c main/gui_favorites.c \
diff --git a/android/jni/android_gfx.c b/android/jni/android_gfx.c
index 5f21a1c..66af69a 100644
--- a/android/jni/android_gfx.c
+++ b/android/jni/android_gfx.c
@@ -239,7 +239,7 @@ void gfx_draw_line (struct image *dimg, int x1, int y1, int x2, int y2, struct l
 /*
  * draw polygon
  */
-void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_style style, struct color c) {
+void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_style style, struct color *c) {
 	static GLfloat *polygon = NULL;
 	static int polygon_cnt = 0;
 	int i;
@@ -262,7 +262,7 @@ void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_styl
 
 	glUseProgram (engine.gles_prgobject);
 	glUniform1i (engine.gles_txenabled, 0);
-	glUniform4fv(engine.gles_color, 1, c.c.array);
+	glUniform4fv(engine.gles_color, 1, c->c.array);
 	glVertexAttribPointer (engine.gles_pos, 3, GL_FLOAT, GL_FALSE, 0, polygon);
     glDrawArrays (GL_TRIANGLE_FAN, 0, pcnt);