[gnome-maps/wip/jonasdn/vector-tiles] Update to new API
- From: Jonas Danielsson <jonasdn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/jonasdn/vector-tiles] Update to new API
- Date: Tue, 5 May 2015 19:02:26 +0000 (UTC)
commit 4f4631ae587dac10c33e4bf33ceae1b6c4b46679
Author: Jonas Danielsson <jonas threetimestwo org>
Date: Tue May 5 21:00:50 2015 +0200
Update to new API
lib/maps-mapbox-renderer.c | 7 ++-----
lib/maps-mapbox-text-layer.c | 4 +---
2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/lib/maps-mapbox-renderer.c b/lib/maps-mapbox-renderer.c
index aab1cca..1b50207 100644
--- a/lib/maps-mapbox-renderer.c
+++ b/lib/maps-mapbox-renderer.c
@@ -179,11 +179,9 @@ on_canvas_draw (ClutterCanvas *canvas,
gboolean success;
GList *texts, *l;
- mapbox = vtile_mapbox_new (data->data,
- data->size,
- width,
+ mapbox = vtile_mapbox_new (width,
champlain_tile_get_zoom_level (data->tile));
-
+ vtile_mapbox_load (mapbox, data->data, data->size, NULL);
vtile_mapbox_set_stylesheet (mapbox, data->stylesheet);
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
@@ -192,7 +190,6 @@ on_canvas_draw (ClutterCanvas *canvas,
vtile_mapbox_render (mapbox, cr, NULL);
-
actor = clutter_actor_new ();
clutter_actor_set_size (actor,
champlain_tile_get_size (data->tile),
diff --git a/lib/maps-mapbox-text-layer.c b/lib/maps-mapbox-text-layer.c
index 027c250..8c6d107 100644
--- a/lib/maps-mapbox-text-layer.c
+++ b/lib/maps-mapbox-text-layer.c
@@ -89,9 +89,7 @@ on_text_draw (ClutterCanvas *canvas,
cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- cairo_set_source_surface (cr, text->surface,
- -text->surface_offset_x,
- -text->surface_offset_y);
+ cairo_set_source_surface (cr, text->surface, 0, 0);
cairo_paint (cr);
surface = cairo_get_target (cr);
g_signal_handlers_disconnect_by_func (canvas, on_text_draw, text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]