/*
- * 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
* greyscale elevation overlay on the planets surface.
*/
-#include <gtk/gtkgl.h>
#include <glib/gstdio.h>
#include <GL/gl.h>
#include "elev.h"
-#define MAX_RESOLUTION 500
+#define MAX_RESOLUTION 50
#define TILE_WIDTH 1024
#define TILE_HEIGHT 512
#define TILE_SIZE (TILE_WIDTH*TILE_HEIGHT*sizeof(guint16))
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",
+ g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
len, TILE_SIZE);
g_free(data);
return NULL;
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;
elev->mutex = g_mutex_new();
elev->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
elev->wms = grits_wms_new(
- "http://www.nasa.network.com/elev", "srtm30", "application/bil",
+ "http://www.nasa.network.com/elev", "mergedSrtm", "application/bil",
"srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
}
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;