Misc pointer fixes

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 4c28847a40b2972098013e0b2018c6477df36679..d8ffc009e338c8d084352e85d902832cf993e831 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -195,7 +195,7 @@ static void _load_tile(GisTile *tile, gpointer _self)
        GisPluginElev *self = _self;
 
        struct _LoadTileData *load = g_new0(struct _LoadTileData, 1);
-       load->path = gis_wms_make_local(self->wms, tile);
+       load->path = gis_wms_fetch(self->wms, tile, GIS_ONCE, NULL, NULL);
        g_debug("GisPluginElev: _load_tile: %s", load->path);
        load->self = self;
        load->tile = tile;
@@ -204,6 +204,7 @@ static void _load_tile(GisTile *tile, gpointer _self)
                load->data->bil = _load_bil(load->path);
                if (!load->data->bil) {
                        g_remove(load->path);
+                       g_free(load->data);
                        g_free(load->path);
                        g_free(load);
                        return;
@@ -230,7 +231,8 @@ static void _free_tile(GisTile *tile, gpointer _self)
 {
        GisPluginElev *self = _self;
        g_debug("GisPluginElev: _free_tile: %p", tile->data);
-       g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
+       if (tile->data)
+               g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
 }
 
 static gpointer _update_tiles(gpointer _self)
@@ -258,16 +260,6 @@ static void _on_location_changed(GisViewer *viewer,
        g_thread_create(_update_tiles, self, FALSE, NULL);
 }
 
-static gpointer _expose(GisCallback *callback, gpointer _self)
-{
-       GisPluginElev *self = GIS_PLUGIN_ELEV(_self);
-       g_debug("GisPluginElev: expose tiles=%p data=%p",
-               self->tiles, self->tiles->data);
-       if (LOAD_OPENGL)
-               gis_viewer_render_tiles(self->viewer, self->tiles);
-       return NULL;
-}
-
 /***********
  * Methods *
  ***********/
@@ -286,8 +278,8 @@ GisPluginElev *gis_plugin_elev_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_WORLD, 0);
+       if (LOAD_OPENGL)
+               gis_viewer_add(viewer, GIS_OBJECT(self->tiles), GIS_LEVEL_WORLD, 0);
 
        return self;
 }