GisTile: use g_object_unref instead of g_free

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index d85b70bfe05a3c05b91306490563e1eb8cf2d5ce..65821d74038872e2f04d09d51d3dd77466b88e25 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -394,6 +394,7 @@ static gboolean on_expose(GisOpenGL *self, GdkEventExpose *event, gpointer _)
 #else
        g_tree_foreach(self->objects, _draw_level, self);
        if (self->wireframe) {
 #else
        g_tree_foreach(self->objects, _draw_level, self);
        if (self->wireframe) {

+               glClear(GL_DEPTH_BUFFER_BIT);

                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                roam_sphere_draw(self->sphere);
        }
                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                roam_sphere_draw(self->sphere);
        }

diff --git a/src/objects/gis-tile.c b/src/objects/gis-tile.c
index 2fe720285fa3b2ed76356b98399c73c5ced05bfe..14430f45bfbac4f95ab92af87713aeadee265da2 100644 (file)
--- a/src/objects/gis-tile.c
+++ b/src/objects/gis-tile.c
@@ -173,7 +173,7 @@ GisTile *gis_tile_gc(GisTile *self, time_t atime,
        //              self, (guint)self->atime, (guint)atime);
        if (!has_children && self->atime < atime && self->data) {
                free_func(self, user_data);
        //              self, (guint)self->atime, (guint)atime);
        if (!has_children && self->atime < atime && self->data) {
                free_func(self, user_data);

-               g_free(self);
+               g_object_unref(self);

                return NULL;
        }
        return self;
                return NULL;
        }
        return self;

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 2a61cde9df10ed7074489a2f5b328230f92e6a50..0783811a98216743b00c20e4187e3bc70bd98128 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -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);
                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;
                        g_free(load->path);
                        g_free(load);
                        return;