From da065b411d6bee9e7f9b7424bb615d64c7e4cc54 Mon Sep 17 00:00:00 2001 From: Stefan Wildemann Date: Wed, 8 Sep 2021 11:00:46 +0200 Subject: FIX:maptool: remove assertion from item_bin_copy_attr (#1149) The removed assertion disallowed the use of item_bin_copy_attr for anything else than attr_osm_wayid when debug build was enabled. This used to work prior the introduction of multipolygon support. There item_bin_copy_attr is used to copy al kind of attrs not knowing about the assert. So remove the assert as it seems to have been never correct. --- navit/maptool/itembin.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'navit') diff --git a/navit/maptool/itembin.c b/navit/maptool/itembin.c index 3996d6f6a..5df29df77 100644 --- a/navit/maptool/itembin.c +++ b/navit/maptool/itembin.c @@ -85,13 +85,10 @@ void item_bin_copy_coord(struct item_bin *ib, struct item_bin *from, int dir) { for (i = 1 ; i <= count ; i++) item_bin_add_coord(ib, &c[count-i], 1); } - void item_bin_copy_attr(struct item_bin *ib, struct item_bin *from, enum attr_type attr) { struct attr_bin *ab=item_bin_get_attr_bin(from, attr, NULL); if (ab) item_bin_add_attr_data(ib, ab->type, (void *)(ab+1), (ab->len-1)*4); - assert(attr == attr_osm_wayid); - assert(item_bin_get_wayid(ib) == item_bin_get_wayid(from)); } void item_bin_add_coord_rect(struct item_bin *ib, struct rect *r) { -- cgit v1.2.1