Fix:core:Refactoring|Rename, unused variables removed, static added.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5347 ffa7fe5e-494d-0410-b361-a75ebd5db220

3 files changed, 3 insertions, 10 deletions

diff --git a/navit/navit.c b/navit/navit.c
index aa9d82c6..dcb3f960 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -398,7 +398,7 @@ navit_restrict_to_range(int value, int min, int max){
 }
 
 static void
-navit_restrict_map_center_to_visible_area(struct transformation *tr, struct coord *new_center){
+navit_restrict_map_center_to_world_boundingbox(struct transformation *tr, struct coord *new_center){
 	new_center->x = navit_restrict_to_range(new_center->x, WORLD_BOUNDINGBOX_MIN_X, WORLD_BOUNDINGBOX_MAX_X);
 	new_center->y = navit_restrict_to_range(new_center->y, WORLD_BOUNDINGBOX_MIN_Y, WORLD_BOUNDINGBOX_MAX_Y);
 }
@@ -419,12 +419,12 @@ update_transformation(struct transformation *tr, struct point *old, struct point
 	center_old=transform_get_center(tr);
 	center_new.x=center_old->x+coord_old.x-coord_new.x;
 	center_new.y=center_old->y+coord_old.y-coord_new.y;
-	navit_restrict_map_center_to_visible_area(tr, &center_new);
+	navit_restrict_map_center_to_world_boundingbox(tr, &center_new);
 	dbg(1,"change center from 0x%x,0x%x to 0x%x,0x%x\n", center_old->x, center_old->y, center_new.x, center_new.y);
 	transform_set_center(tr, &center_new);
 }
 
-void
+static void
 navit_set_timeout(struct navit *this_)
 {
 	struct attr follow;
diff --git a/navit/navit.h b/navit/navit.h
index 68d3c9fe..4f8a7dc0 100644
--- a/navit/navit.h
+++ b/navit/navit.h
@@ -64,7 +64,6 @@ int navit_get_width(struct navit *this_);
 int navit_get_height(struct navit *this_);
 int navit_ignore_button(struct navit *this_);
 void navit_ignore_graphics_events(struct navit *this_, int ignore);
-void navit_set_timeout(struct navit *this_);
 int navit_handle_button(struct navit *this_, int pressed, int button, struct point *p, struct callback *popup_callback);
 void navit_handle_motion(struct navit *this_, struct point *p);
 void navit_zoom_in(struct navit *this_, int factor, struct point *p);
diff --git a/navit/transform.c b/navit/transform.c
index 63cc1c48..42308e02 100644
--- a/navit/transform.c
+++ b/navit/transform.c
@@ -427,7 +427,6 @@ transform(struct transformation *t, enum projection pro, struct coord *c, struct
 	int xcn, ycn; 
 	struct coord_geo g;
 	int xc, yc, zc=0, xco=0, yco=0, zco=0;
-	int xm,ym,zct;
 	int zlimit=t->znear;
 	int visible, visibleo=-1;
 	int i,j = 0,k=0;
@@ -442,21 +441,16 @@ transform(struct transformation *t, enum projection pro, struct coord *c, struct
 			xc=c1.x;
 			yc=c1.y;
 		}
-		xm=xc;
-		ym=yc;
 		xc-=t->map_center.x;
 		yc-=t->map_center.y;
 		xc >>= t->scale_shift;
 		yc >>= t->scale_shift;
-		xm=xc;
-		ym=yc;
 
 		xcn=xc*t->m00+yc*t->m01+HOG(*t)*t->m02;
 		ycn=xc*t->m10+yc*t->m11+HOG(*t)*t->m12;
 
 		if (t->ddd) {
 			zc=(xc*t->m20+yc*t->m21+HOG(*t)*t->m22);
-			zct=zc;
 			zc+=t->offz << POST_SHIFT;
 			dbg(1,"zc=%d\n", zc);
 			dbg(1,"zc(%d)=xc(%d)*m20(%d)+yc(%d)*m21(%d)\n", (xc*t->m20+yc*t->m21), xc, t->m20, yc, t->m21);