Misc pointer fixes

[grits] / src / plugins / map.c

diff --git a/src/plugins/map.c b/src/plugins/map.c
index b39ae34aeaeef204b538cfba764138cce6eda003..cdc6f24d379c8b008e71247ec159e6aaabaa3aa5 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -71,7 +71,6 @@ static gboolean _load_tile_cb(gpointer _data)
        }
 
        guint *tex = g_new0(guint, 1);
-       gis_viewer_begin(self->viewer);
        glGenTextures(1, tex);
        glBindTexture(GL_TEXTURE_2D, *tex);
 
@@ -84,7 +83,6 @@ static gboolean _load_tile_cb(gpointer _data)
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
        glFlush();
-       gis_viewer_end(self->viewer);
 
        tile->data = tex;
        gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
@@ -96,7 +94,7 @@ static void _load_tile(GisTile *tile, gpointer _self)
 {
        GisPluginMap *self = _self;
        g_debug("GisPluginMap: _load_tile start %p", g_thread_self());
-       char *path = gis_wms_make_local(self->wms, tile);
+       char *path = gis_wms_fetch(self->wms, tile, GIS_ONCE, NULL, NULL);
        struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
        data->self   = self;
        data->tile   = tile;
@@ -120,7 +118,7 @@ static gboolean _free_tile_cb(gpointer data)
 static void _free_tile(GisTile *tile, gpointer _self)
 {
        GisPluginMap *self = _self;
-       g_debug("GisPluginMap: _free_tile: %p=%d", tile->data, *(guint*)tile->data);
+       g_debug("GisPluginMap: _free_tile: %p", tile->data);
        g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
 }
 
@@ -150,15 +148,6 @@ static void _on_location_changed(GisViewer *viewer,
        g_thread_create(_update_tiles, self, FALSE, NULL);
 }
 
-static gpointer _expose(GisCallback *callback, gpointer _self)
-{
-       GisPluginMap *self = GIS_PLUGIN_MAP(_self);
-       g_debug("GisPluginMap: expose viewer=%p tiles=%p,%p",
-                       self->viewer, self->tiles, self->tiles->data);
-       gis_viewer_render_tiles(self->viewer, self->tiles);
-       return NULL;
-}
-
 /***********
  * Methods *
  ***********/
@@ -177,8 +166,7 @@ GisPluginMap *gis_plugin_map_new(GisViewer *viewer)
                        G_CALLBACK(_on_location_changed), self);
 
        /* Add renderers */
-       GisCallback *callback = gis_callback_new(_expose, self);
-       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_OVERLAY, 0);
+       gis_viewer_add(viewer, GIS_OBJECT(self->tiles), GIS_LEVEL_OVERLAY, 0);
 
        return self;
 }