Move OpenGL includes to a common place

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 078fb9108738dd7a57be8dc85da838b1be0b1fa5..d8c645610a1ce6c0418a4b2c14a7140ab0177766 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
  */
 
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 
@@ -113,8 +112,8 @@ static guint16 *_load_bil(gchar *path)
        g_file_get_contents(path, &data, &len, NULL);
        g_debug("GritsPluginElev: load_bil %p", data);
        if (len != TILE_SIZE) {
-               g_warning("GritsPluginElev: _load_bil - unexpected tile size %d, != %d",
-                               len, TILE_SIZE);
+               g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
+                               (glong)len, (glong)TILE_SIZE);
                g_free(data);
                return NULL;
        }
@@ -204,6 +203,7 @@ static void _load_tile(GritsTile *tile, gpointer _elev)
 
        struct _LoadTileData *load = g_new0(struct _LoadTileData, 1);
        load->path = grits_wms_fetch(elev->wms, tile, GRITS_ONCE, NULL, NULL);
+       if (!load->path) return; // Canceled/error
        g_debug("GritsPluginElev: _load_tile: %s", load->path);
        load->elev = elev;
        load->tile = tile;
@@ -339,7 +339,7 @@ static void grits_plugin_elev_dispose(GObject *gobject)
                if (LOAD_BIL)
                        grits_viewer_clear_height_func(elev->viewer);
                if (LOAD_OPENGL)
-                       grits_viewer_remove(elev->viewer, elev->tiles);
+                       grits_viewer_remove(elev->viewer, GRITS_OBJECT(elev->tiles));
                g_signal_handler_disconnect(elev->viewer, elev->sigid);
                g_object_unref(elev->viewer);
                elev->viewer = NULL;