From b1b9191d24ded4ea62606bc03a27fe6340889837 Mon Sep 17 00:00:00 2001
From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sat, 18 Oct 2008 20:16:11 +0000
Subject: [PATCH] Fix:data_mg:Converted g_assert to dbg_assert

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1496 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/navit/data/mg/block.c  | 12 ++++++------
 navit/navit/data/mg/map.c    |  2 +-
 navit/navit/data/mg/street.c |  6 +++---
 navit/navit/data/mg/town.c   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/navit/navit/data/mg/block.c b/navit/navit/data/mg/block.c
index a8f1059..e22440a 100644
--- a/navit/navit/data/mg/block.c
+++ b/navit/navit/data/mg/block.c
@@ -132,10 +132,10 @@ block_rect_print(struct coord_rect *r)
 static void
 block_rect_same(struct coord_rect *r1, struct coord_rect *r2)
 {
-	g_assert(r1->lu.x==r2->lu.x);
-	g_assert(r1->lu.y==r2->lu.y);
-	g_assert(r1->rl.x==r2->rl.x);
-	g_assert(r1->rl.y==r2->rl.y);
+	dbg_assert(r1->lu.x==r2->lu.x);
+	dbg_assert(r1->lu.y==r2->lu.y);
+	dbg_assert(r1->rl.x==r2->rl.x);
+	dbg_assert(r1->rl.y==r2->rl.y);
 }
 
 int
@@ -245,7 +245,7 @@ block_next(struct map_rect_priv *mr)
 				if (coord_rect_overlap(&mr->cur_sel->u.c_rect, &bt->r_curr)) {
 					mr->b.b=block_get_byid(mr->file, blk_num, &mr->b.p);
 					mr->b.block_num=blk_num;
-					g_assert(mr->b.b != NULL);
+					dbg_assert(mr->b.b != NULL);
 					mr->b.block_start=(unsigned char *)(mr->b.b);
 					mr->b.p_start=mr->b.p;
 					mr->b.end=mr->b.block_start+mr->b.b->size;
@@ -262,7 +262,7 @@ block_next(struct map_rect_priv *mr)
 					bt->stack[bt->stackp].rl.y=coord+1;
 				}
 				bt->stackp++;
-				g_assert(bt->stackp < BT_STACK_SIZE);
+				dbg_assert(bt->stackp < BT_STACK_SIZE);
 			} else {
 				if (bt->stackp) {
 					bt->stackp--;
diff --git a/navit/navit/data/mg/map.c b/navit/navit/data/mg/map.c
index a7590ee..214ab9d 100644
--- a/navit/navit/data/mg/map.c
+++ b/navit/navit/data/mg/map.c
@@ -474,7 +474,7 @@ map_new_mg(struct map_methods *meth, struct attr **attrs)
 			if (! m->file[i]) {
 				maybe_missing=(i == file_border_ply || i == file_height_ply || i == file_sea_ply);
 				if (! maybe_missing)
-					g_warning("Failed to load %s", filename);
+					dbg(0,"Failed to load %s", filename);
 			} else
 				file_mmap(m->file[i]);
 			g_free(filename);
diff --git a/navit/navit/data/mg/street.c b/navit/navit/data/mg/street.c
index 5735bce..c80196e 100644
--- a/navit/navit/data/mg/street.c
+++ b/navit/navit/data/mg/street.c
@@ -93,8 +93,8 @@ static int street_get_bytes(struct coord_rect *r)
         bytes=2;
         dx=r->rl.x-r->lu.x;
         dy=r->lu.y-r->rl.y;
-	g_assert(dx > 0);
-	g_assert(dy > 0); 
+	dbg_assert(dx > 0);
+	dbg_assert(dy > 0); 
         if (dx > 32767 || dy > 32767)
                 bytes=3;
         if (dx > 8388608 || dy > 8388608)
@@ -356,7 +356,7 @@ street_get(struct map_rect_priv *mr, struct street_priv *street, struct item *it
 	if (L(street->str->segid) < 0)
 		street->type++;
 #if 0
-	g_assert(street->p != NULL);
+	dbg_assert(street->p != NULL);
 #endif
 	street->next=NULL;
 	street->status_rewind=street->status=L(street->str[1].segid) >= 0 ? 0:1;
diff --git a/navit/navit/data/mg/town.c b/navit/navit/data/mg/town.c
index 9f5b93d..6641038 100644
--- a/navit/navit/data/mg/town.c
+++ b/navit/navit/data/mg/town.c
@@ -104,7 +104,7 @@ town_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
 		twn->attr_next=attr_none;
 		return 1;
 	default:
-		g_assert(1==0);
+		dbg_assert(1==0);
 		return 0;
 	}
 	return 1;
-- 
2.7.4