csv.h (navit-0.5.5) | : | csv.h (navit-0.5.6) | ||
---|---|---|---|---|
skipping to change at line 29 | skipping to change at line 29 | |||
#include <stdio.h> | #include <stdio.h> | |||
#include <glib.h> | #include <glib.h> | |||
#include "attr.h" | #include "attr.h" | |||
#include "coord.h" | #include "coord.h" | |||
#include "quadtree.h" | #include "quadtree.h" | |||
struct map_priv { | struct map_priv { | |||
int id; | int id; | |||
struct quadtree_node* tree_root; | struct quadtree_node* tree_root; /**< Root of the quadtree from which ite ms can be retrieved by their coordinates */ | |||
int flags; | int flags; | |||
GHashTable*qitem_hash; | GHashTable*qitem_hash; /**< Hash table to retrieve items by the | |||
char* filename; | ir ID */ | |||
/*need to write map file on exit*/ | char* filename; /**< Name of the file in which the map i | |||
int dirty; | s stored */ | |||
int attr_cnt; | int dirty; /**< Need to write map file on exit */ | |||
enum attr_type *attr_types; | int attr_cnt; /**< Number of elements in `attr_types` | |||
int next_item_idx; | */ | |||
enum item_type item_type; | enum attr_type *attr_types; /**< Array of attribute types supported | |||
/*list of quadtree items that have no coord set yet ()*/ | by this map */ | |||
GList* new_items; | int next_item_idx; /**< Zero-based index (`id_lo`) for the | |||
char *charset; | next item to be added */ | |||
enum item_type item_type; /**< Item type stored in this map */ | ||||
GList* new_items; /**< List of quadtree items that have no | ||||
coord set yet */ | ||||
char *charset; /**< Identifier for the character set of | ||||
this map */ | ||||
}; | }; | |||
struct map_rect_priv { | struct map_rect_priv { | |||
struct map_selection *sel; | struct map_selection *sel; | |||
struct quadtree_iter *qiter; | struct quadtree_iter *qiter; | |||
struct quadtree_item *qitem; | struct quadtree_item *qitem; | |||
struct coord c; | struct coord c; | |||
int bStarted; | int bStarted; | |||
struct item item; | struct item item; | |||
struct map_priv *m; | struct map_priv *m; | |||
End of changes. 2 change blocks. | ||||
12 lines changed or deleted | 17 lines changed or added |