X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fmap.c;h=d30439187dfe13b3cbd67d58f2c9ea4a8d01e3c4;hp=7395ef7792c7598d4220f356090550be70ecade5;hb=7a6093db8586e5cb0625a6092ee8304af900941f;hpb=7aefe194719b37d7e03dbbb89e70b95a4455e446 diff --git a/src/plugins/map.c b/src/plugins/map.c index 7395ef7..d304391 100644 --- a/src/plugins/map.c +++ b/src/plugins/map.c @@ -88,8 +88,8 @@ static gboolean _load_tile_cb(gpointer _data) (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glFlush(); tile->data = tex; @@ -156,6 +156,13 @@ static void _on_location_changed(GisViewer *viewer, g_thread_create(_update_tiles, map, FALSE, NULL); } +static gpointer _threaded_init(GisPluginMap *map) +{ + _load_tile(map->tiles, map); + _update_tiles(map); + return NULL; +} + /*********** * Methods * ***********/ @@ -174,8 +181,7 @@ GisPluginMap *gis_plugin_map_new(GisViewer *viewer) map->viewer = g_object_ref(viewer); /* Load initial tiles */ - _load_tile(map->tiles, map); - g_thread_create(_update_tiles, map, FALSE, NULL); + g_thread_create((GThreadFunc)_threaded_init, map, FALSE, NULL); /* Connect signals */ map->sigid = g_signal_connect(map->viewer, "location-changed",