[libchamplain] Adapt champlain to the latest changes in libmemphis.
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain] Adapt champlain to the latest changes in libmemphis.
- Date: Sun, 24 Jan 2010 20:14:42 +0000 (UTC)
commit 5dba9d0f219d8761aaa121d431252672ad65adbd
Author: Simon Wenner <simon wenner ch>
Date: Sun Oct 25 01:29:28 2009 +0200
Adapt champlain to the latest changes in libmemphis.
The debug level properties of memphis have been removed. This should speedup rendering and parsing too.
champlain/champlain-local-map-data-source.c | 1 -
champlain/champlain-memphis-map-source.c | 4 ----
champlain/champlain-network-map-data-source.c | 1 -
3 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/champlain/champlain-local-map-data-source.c b/champlain/champlain-local-map-data-source.c
index 381ff83..6935e41 100644
--- a/champlain/champlain-local-map-data-source.c
+++ b/champlain/champlain-local-map-data-source.c
@@ -158,7 +158,6 @@ champlain_local_map_data_source_load_map_data (ChamplainLocalMapDataSource *self
ChamplainBoundingBox *bbox;
MemphisMap *map = memphis_map_new ();
- memphis_map_set_debug_level (map, 0);
memphis_map_load_from_file (map, map_path);
if (priv->map)
diff --git a/champlain/champlain-memphis-map-source.c b/champlain/champlain-memphis-map-source.c
index 863dcca..fcaace3 100644
--- a/champlain/champlain-memphis-map-source.c
+++ b/champlain/champlain-memphis-map-source.c
@@ -57,8 +57,6 @@
#define MAX_THREADS 4
#define DEFAULT_TILE_SIZE 256 // FIXME: switching between map sources
// with different tile size crashes champlain.
-/* 0: Be quiet, 1: Normal output, 2: Be verbose */
-#define MEMPHIS_INTERNAL_DEBUG_LEVEL 0
const gchar default_rules[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
@@ -531,8 +529,6 @@ champlain_memphis_map_source_new_full (ChamplainMapSourceDesc *desc,
priv->renderer = memphis_renderer_new_full (priv->rules, map);
memphis_renderer_set_resolution (priv->renderer, DEFAULT_TILE_SIZE);
- memphis_renderer_set_debug_level (priv->renderer,
- MEMPHIS_INTERNAL_DEBUG_LEVEL);
memphis_rule_set_load_from_data (priv->rules, default_rules,
strlen (default_rules));
diff --git a/champlain/champlain-network-map-data-source.c b/champlain/champlain-network-map-data-source.c
index cbd0f39..81e4b4a 100644
--- a/champlain/champlain-network-map-data-source.c
+++ b/champlain/champlain-network-map-data-source.c
@@ -252,7 +252,6 @@ load_map_data_cb (SoupSession *session, SoupMessage *msg,
}
MemphisMap *map = memphis_map_new ();
- memphis_map_set_debug_level (map, 0);
memphis_map_load_from_data (map,
msg->response_body->data,
msg->response_body->length);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]