Refactor:Remove unused parameter 'alpha' for overlays

12 files changed, 38 insertions, 42 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 2b45b2737..5817f4773 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -686,7 +686,7 @@ public class NavitGraphics
 	}
 	
 	public NavitGraphics(final Activity activity, NavitGraphics parent, int x, int y, int w, int h,
-			int alpha, int wraparound, int use_camera)
+			int wraparound, int use_camera)
 	{
 		if (parent == null)
 		{
@@ -1007,7 +1007,7 @@ public class NavitGraphics
 		}
 	}
 
-	protected void overlay_resize(int x, int y, int w, int h, int alpha, int wraparound)
+	protected void overlay_resize(int x, int y, int w, int h, int wraparound)
 	{
 		//Log.e("NavitGraphics","overlay_resize");
 		draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
diff --git a/navit/graphics.c b/navit/graphics.c
index d7c4e9dd3..44993b3e3 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -305,7 +305,7 @@ struct graphics * graphics_overlay_new(struct graphics *parent, struct point *p,
 	if (!parent->meth.overlay_new)
 		return NULL;
 	this_=g_new0(struct graphics, 1);
-	this_->priv=parent->meth.overlay_new(parent->priv, &this_->meth, p, w, h, 65535, wraparound);
+	this_->priv=parent->meth.overlay_new(parent->priv, &this_->meth, p, w, h, wraparound);
 	this_->image_cache_hash = parent->image_cache_hash;
 	this_->parent = parent;
 	pr.lu.x=0;
@@ -337,7 +337,7 @@ graphics_overlay_resize(struct graphics *this_, struct point *p, int w, int h, i
 		return;
 	}
 
-	this_->meth.overlay_resize(this_->priv, p, w, h, 65535, wraparound);
+	this_->meth.overlay_resize(this_->priv, p, w, h, wraparound);
 }
 
 static void
diff --git a/navit/graphics.h b/navit/graphics.h
index fc72fb3b8..810355f2d 100644
--- a/navit/graphics.h
+++ b/navit/graphics.h
@@ -73,13 +73,13 @@ struct graphics_methods {
 	struct graphics_font_priv *(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font,  int size, int flags);
 	struct graphics_gc_priv *(*gc_new)(struct graphics_priv *gr, struct graphics_gc_methods *meth);
 	void (*background_gc)(struct graphics_priv *gr, struct graphics_gc_priv *gc);
-	struct graphics_priv *(*overlay_new)(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound);
+	struct graphics_priv *(*overlay_new)(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
 	struct graphics_image_priv *(*image_new)(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot, int rotation);
 	void *(*get_data)(struct graphics_priv *gr, const char *type);
 	void (*image_free)(struct graphics_priv *gr, struct graphics_image_priv *priv);
 	void (*get_text_bbox)(struct graphics_priv *gr, struct graphics_font_priv *font, char *text, int dx, int dy, struct point *ret, int estimate);
 	void (*overlay_disable)(struct graphics_priv *gr, int disable);
-	void (*overlay_resize)(struct graphics_priv *gr, struct point *p, int w, int h, int alpha, int wraparound);
+	void (*overlay_resize)(struct graphics_priv *gr, struct point *p, int w, int h, int wraparound);
 	int (*set_attr)(struct graphics_priv *gr, struct attr *attr);
 };
 
diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c
index 362e3d9d0..a543252ce 100644
--- a/navit/graphics/android/graphics_android.c
+++ b/navit/graphics/android/graphics_android.c
@@ -414,7 +414,7 @@ draw_mode(struct graphics_priv *gra, enum draw_mode_num mode)
 	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_mode, (int)mode);
 }
 
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound);
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
 
 static void *
 get_data(struct graphics_priv *this, const char *type)
@@ -451,9 +451,9 @@ static void overlay_disable(struct graphics_priv *gra, int disable)
 	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_overlay_disable, disable);
 }
 
-static void overlay_resize(struct graphics_priv *gra, struct point *pnt, int w, int h, int alpha, int wraparound)
+static void overlay_resize(struct graphics_priv *gra, struct point *pnt, int w, int h, int wraparound)
 {
-	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_overlay_resize, pnt ? pnt->x:0 , pnt ? pnt->y:0, w, h, alpha, wraparound);
+	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_overlay_resize, pnt ? pnt->x:0 , pnt ? pnt->y:0, w, h, wraparound);
 }
 
 static int
@@ -550,7 +550,7 @@ set_activity(jobject graphics)
 }
 
 static int
-graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, struct point *pnt, int w, int h, int alpha, int wraparound, int use_camera)
+graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, struct point *pnt, int w, int h, int wraparound, int use_camera)
 {
 	struct callback *cb;
 	jmethodID cid, Context_getPackageName;
@@ -603,13 +603,13 @@ graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, s
 	if (!find_class_global("org/navitproject/navit/NavitGraphics", &ret->NavitGraphicsClass))
 		return 0;
 	dbg(lvl_debug,"at 3\n");
-	cid = (*jnienv)->GetMethodID(jnienv, ret->NavitGraphicsClass, "<init>", "(Landroid/app/Activity;Lorg/navitproject/navit/NavitGraphics;IIIIIII)V");
+	cid = (*jnienv)->GetMethodID(jnienv, ret->NavitGraphicsClass, "<init>", "(Landroid/app/Activity;Lorg/navitproject/navit/NavitGraphics;IIIIII)V");
 	if (cid == NULL) {
 		dbg(lvl_error,"no method found\n");
 		return 0; /* exception thrown */
 	}
 	dbg(lvl_debug,"at 4 android_activity=%p\n",android_activity);
-	ret->NavitGraphics=(*jnienv)->NewObject(jnienv, ret->NavitGraphicsClass, cid, android_activity, parent ? parent->NavitGraphics : NULL, pnt ? pnt->x:0 , pnt ? pnt->y:0, w, h, alpha, wraparound, use_camera);
+	ret->NavitGraphics=(*jnienv)->NewObject(jnienv, ret->NavitGraphicsClass, cid, android_activity, parent ? parent->NavitGraphics : NULL, pnt ? pnt->x:0 , pnt ? pnt->y:0, w, h, wraparound, use_camera);
 	dbg(lvl_debug,"result=%p\n",ret->NavitGraphics);
 	if (ret->NavitGraphics)
 		ret->NavitGraphics = (*jnienv)->NewGlobalRef(jnienv, ret->NavitGraphics);
@@ -675,7 +675,7 @@ graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, s
 		return 0;
 	if (!find_method(ret->NavitGraphicsClass, "overlay_disable", "(I)V", &ret->NavitGraphics_overlay_disable))
 		return 0;
-	if (!find_method(ret->NavitGraphicsClass, "overlay_resize", "(IIIIII)V", &ret->NavitGraphics_overlay_resize))
+	if (!find_method(ret->NavitGraphicsClass, "overlay_resize", "(IIIII)V", &ret->NavitGraphics_overlay_resize))
 		return 0;
 	if (!find_method(ret->NavitGraphicsClass, "SetCamera", "(I)V", &ret->NavitGraphics_SetCamera))
 		return 0;
@@ -745,7 +745,7 @@ graphics_android_new(struct navit *nav, struct graphics_methods *meth, struct at
 		command_add_table(attr->u.callback_list, commands, sizeof(commands)/sizeof(struct command_table), ret);
         }
 	image_cache_hash = g_hash_table_new(g_str_hash, g_str_equal);
-	if (graphics_android_init(ret, NULL, NULL, 0, 0, 0, 0, use_camera)) {
+	if (graphics_android_init(ret, NULL, NULL, 0, 0, 0, use_camera)) {
 		dbg(lvl_debug,"returning %p\n",ret);
 		return ret;
 	} else {
@@ -755,11 +755,11 @@ graphics_android_new(struct navit *nav, struct graphics_methods *meth, struct at
 }
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound)
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound)
 {
 	struct graphics_priv *ret=g_new0(struct graphics_priv, 1);
 	*meth=graphics_methods;
-	if (graphics_android_init(ret, gr, p, w, h, alpha, wraparound, 0)) {
+	if (graphics_android_init(ret, gr, p, w, h, wraparound, 0)) {
 		dbg(lvl_debug,"returning %p\n",ret);
 		return ret;
 	} else {
diff --git a/navit/graphics/cocoa/graphics_cocoa.m b/navit/graphics/cocoa/graphics_cocoa.m
index e9aec60cb..154ea6901 100644
--- a/navit/graphics/cocoa/graphics_cocoa.m
+++ b/navit/graphics/cocoa/graphics_cocoa.m
@@ -556,7 +556,7 @@ background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc)
 }
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound);
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
 
 
 static struct graphics_image_priv *
@@ -649,7 +649,7 @@ static struct graphics_methods graphics_methods = {
 
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound)
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound)
 {
 	struct graphics_priv *ret=g_new0(struct graphics_priv, 1);
 	*meth=graphics_methods;
diff --git a/navit/graphics/gd/graphics_gd.c b/navit/graphics/gd/graphics_gd.c
index 06d63ac2f..b4991f30a 100644
--- a/navit/graphics/gd/graphics_gd.c
+++ b/navit/graphics/gd/graphics_gd.c
@@ -195,7 +195,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXpm (char *filename)
 
 struct graphics_priv {
 	gdImagePtr im;
-	int w,h,flags,alpha,overlay,shmkey,shmsize,shmoffset;
+	int w,h,flags,overlay,shmkey,shmsize,shmoffset;
 	void *shm;
 	struct shmem_header *shm_header;
 	struct point p;
@@ -547,7 +547,7 @@ draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
 	}
 }
 
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha);
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
 
 static void
 add_overlays(struct graphics_priv *overlay, gdImagePtr im)
@@ -633,7 +633,7 @@ overlay_disable(struct graphics_priv *gr, int disable)
 }
 
 static void
-overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int alpha, int wraparound)
+overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int wraparound)
 {
 	dbg(lvl_debug,"enter\n");
 }
@@ -816,7 +816,7 @@ static struct graphics_methods graphics_methods = {
 };
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha)
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound)
 {
 	struct font_priv * (*font_freetype_new)(void *meth);
 	struct graphics_priv *ret;
@@ -831,7 +831,6 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
 	ret->p=*p;
 	ret->w=w;
 	ret->h=h;
-	ret->alpha=alpha;
 	ret->overlay=1;
 	ret->flags=1;
 	ret->im=gdImageCreateTrueColor(ret->w,ret->h);
diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 1007a3564..332673529 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -73,7 +73,6 @@ struct graphics_priv {
 	int visible;
 	int overlay_disabled;
 	int overlay_autodisabled;
-	int a;
 	int wraparound;
 	struct graphics_priv *parent;
 	struct graphics_priv *overlays;
@@ -847,7 +846,7 @@ overlay_disable(struct graphics_priv *gr, int disabled)
 }
 
 static void
-overlay_resize(struct graphics_priv *this, struct point *p, int w, int h, int alpha, int wraparound)
+overlay_resize(struct graphics_priv *this, struct point *p, int w, int h, int wraparound)
 {
 	//do not dereference parent for non overlay osds
 	if(!this->parent) {
@@ -880,7 +879,6 @@ overlay_resize(struct graphics_priv *this, struct point *p, int w, int h, int al
 		changed = 1;
 	}
 
-	this->a = alpha >> 8;
 	this->wraparound = wraparound;
 
 	if (changed) {
@@ -939,7 +937,7 @@ set_attr(struct graphics_priv *gr, struct attr *attr)
 }
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound)
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound)
 {
 	int w2,h2;
 	struct graphics_priv *this=graphics_gtk_drawing_area_new_helper(meth);
@@ -974,7 +972,6 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
 	}
 
 	this->next=gr->overlays;
-	this->a=alpha >> 8;
 	this->wraparound=wraparound;
 	gr->overlays=this;
 	return this;
diff --git a/navit/graphics/null/graphics_null.c b/navit/graphics/null/graphics_null.c
index 22909f7b0..e3d617af2 100644
--- a/navit/graphics/null/graphics_null.c
+++ b/navit/graphics/null/graphics_null.c
@@ -164,7 +164,7 @@ draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
 {
 }
 
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound);
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
 
 static void
 resize_callback(int w, int h)
@@ -211,7 +211,7 @@ static void overlay_disable(struct graphics_priv *gr, int disable)
 {
 }
 
-static void overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int alpha, int wraparound)
+static void overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int wraparound)
 {
 }
 
@@ -239,7 +239,7 @@ static struct graphics_methods graphics_methods = {
 };
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound)
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound)
 {
 	*meth=graphics_methods;
 	return &graphics_priv;
diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index 5d65d1cd7..742dcae51 100644
--- a/navit/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
@@ -1235,7 +1235,7 @@ draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
 static struct graphics_priv *overlay_new(struct graphics_priv *gr,
 					 struct graphics_methods *meth,
 					 struct point *p, int w, int h,
-					 int alpha, int wraparound);
+					 int wraparound);
 
 static int
 graphics_opengl_fullscreen(struct window *w, int on)
@@ -1369,7 +1369,7 @@ overlay_disable(struct graphics_priv *gr, int disable)
 
 static void
 overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h,
-	       int alpha, int wraparound)
+	       int wraparound)
 {
 	int changed = 0;
 	int w2, h2;
@@ -1462,7 +1462,7 @@ graphics_opengl_new_helper(struct graphics_methods *meth)
 
 static struct graphics_priv *
 overlay_new(struct graphics_priv *gr, struct graphics_methods *meth,
-	    struct point *p, int w, int h, int alpha, int wraparound)
+	    struct point *p, int w, int h, int wraparound)
 {
 	struct graphics_priv *this = graphics_opengl_new_helper(meth);
 	this->p = *p;
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index 21ff837d6..20ac0c296 100644
--- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
@@ -529,7 +529,7 @@ static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
 //# Comment: 
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int alpha, int wraparound);
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int wraparound);
 
 static int argc=1;
 static char *argv[]={NULL,NULL,NULL};
@@ -704,7 +704,7 @@ static struct graphics_methods graphics_methods = {
 //# Comment: 
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
-static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int alpha,int wraparound)
+static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int wraparound)
 {
 	*meth=graphics_methods;
 	struct graphics_priv *ret=g_new0(struct graphics_priv, 1);
diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c
index 95a6a7040..b01af5c3f 100644
--- a/navit/graphics/sdl/graphics_sdl.c
+++ b/navit/graphics/sdl/graphics_sdl.c
@@ -840,7 +840,7 @@ static void overlay_disable(struct graphics_priv *gr, int disable)
 }
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound);
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound);
 
 static int window_fullscreen(struct window *win, int on)
 {
@@ -912,7 +912,7 @@ static struct graphics_methods graphics_methods = {
 };
 
 static struct graphics_priv *
-overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int alpha, int wraparound)
+overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int wraparound)
 {
     struct graphics_priv *ov;
     Uint32 rmask, gmask, bmask, amask;
diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c
index 671983505..960e95c77 100644
--- a/navit/graphics/win32/graphics_win32.c
+++ b/navit/graphics/win32/graphics_win32.c
@@ -1477,9 +1477,9 @@ static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, st
 static struct graphics_priv *
             graphics_win32_new_helper(struct graphics_methods *meth);
 
-static void overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int alpha, int wraparound)
+static void overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int int wraparound)
 {
-    dbg(lvl_debug, "resize overlay: %x, x: %d, y: %d, w: %d, h: %d, alpha: %x, wraparound: %d\n", gr, p->x, p->y, w, h, alpha, wraparound);
+    dbg(lvl_debug, "resize overlay: %x, x: %d, y: %d, w: %d, h: %d, wraparound: %d\n", gr, p->x, p->y, w, h, wraparound);
 
     if ( gr->width != w || gr->height != h )
     {
@@ -1494,10 +1494,10 @@ static void overlay_resize(struct graphics_priv *gr, struct point *p, int w, int
 
 
 static struct graphics_priv *
-            overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound)
+            overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound)
 {
     struct graphics_priv *this=graphics_win32_new_helper(meth);
-    dbg(lvl_debug, "overlay: %x, x: %d, y: %d, w: %d, h: %d, alpha: %x, wraparound: %d\n", this, p->x, p->y, w, h, alpha, wraparound);
+    dbg(lvl_debug, "overlay: %x, x: %d, y: %d, w: %d, h: %d, wraparound: %d\n", this, p->x, p->y, w, h, wraparound);
     this->width  = w;
     this->height = h;
     this->parent = gr;