Move gdk_pixbuf calls to main thread

Hopefully this will fix some Win32 issues

diff --git a/src/data/gis-http.c b/src/data/gis-http.c
index b610fa3e67c57d60a79372f71a3d75ac42cdfc2d..f4c4ec5b4046f891990a23d9c6c762842eb9ff42 100644 (file)
--- a/src/data/gis-http.c
+++ b/src/data/gis-http.c
@@ -226,6 +226,8 @@ GList *gis_http_available(GisHttp *http,
                g_snprintf(tmp, sizeof(tmp), ".index.%x", g_random_int());
                gchar *path = gis_http_fetch(http, index, tmp,
                                GIS_REFRESH, NULL, NULL);
                g_snprintf(tmp, sizeof(tmp), ".index.%x", g_random_int());
                gchar *path = gis_http_fetch(http, index, tmp,
                                GIS_REFRESH, NULL, NULL);

+               if (!path)
+                       return files;

                gchar *html;
                g_file_get_contents(path, &html, NULL, NULL);
 
                gchar *html;
                g_file_get_contents(path, &html, NULL, NULL);
 

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 4be4607a1964e298152b8de168cd39ee78c4ed34..5799ca05eb6c1b6709dd9279c4459f755b1c4254 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -47,18 +47,28 @@ static const guchar colormap[][2][4] = {
 struct _LoadTileData {
        GisPluginMap *map;
        GisTile      *tile;
 struct _LoadTileData {
        GisPluginMap *map;
        GisTile      *tile;

-       GdkPixbuf    *pixbuf;
+       gchar        *path;

 };
 static gboolean _load_tile_cb(gpointer _data)
 {
        struct _LoadTileData *data = _data;
 };
 static gboolean _load_tile_cb(gpointer _data)
 {
        struct _LoadTileData *data = _data;

-       GisPluginMap *map    = data->map;
-       GisTile      *tile   = data->tile;
-       GdkPixbuf    *pixbuf = data->pixbuf;
+       GisPluginMap *map  = data->map;
+       GisTile      *tile = data->tile;
+       gchar        *path = data->path;

        g_free(data);
 
        g_free(data);
 

-       /* Create Texture */
+       /* Load pixbuf */

        g_debug("GisPluginMap: _load_tile_cb start");
        g_debug("GisPluginMap: _load_tile_cb start");

+       GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
+       if (!pixbuf) {
+               g_warning("GisPluginMap: _load_tile - Error loading pixbuf %s", path);
+               g_remove(path);
+               g_free(path);
+               return FALSE;
+       }
+       g_free(path);
+
+       /* Create Texture */

        guchar   *pixels = gdk_pixbuf_get_pixels(pixbuf);
        gboolean  alpha  = gdk_pixbuf_get_has_alpha(pixbuf);
        gint      width  = gdk_pixbuf_get_width(pixbuf);
        guchar   *pixels = gdk_pixbuf_get_pixels(pixbuf);
        gboolean  alpha  = gdk_pixbuf_get_has_alpha(pixbuf);
        gint      width  = gdk_pixbuf_get_width(pixbuf);


@@ -102,18 +112,11 @@ static void _load_tile(GisTile *tile, gpointer _map)
 {
        GisPluginMap *map = _map;
        g_debug("GisPluginMap: _load_tile start %p", g_thread_self());
 {
        GisPluginMap *map = _map;
        g_debug("GisPluginMap: _load_tile start %p", g_thread_self());

-       char *path = gis_wms_fetch(map->wms, tile, GIS_ONCE, NULL, NULL);

        struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
        struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);

-       data->map    = map;
-       data->tile   = tile;
-       data->pixbuf = gdk_pixbuf_new_from_file(path, NULL);
-       if (data->pixbuf) {
-               g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);
-       } else {
-               g_warning("GisPluginMap: _load_tile - Error loading pixbuf %s", path);
-               g_remove(path);
-       }
-       g_free(path);
+       data->map  = map;
+       data->tile = tile;
+       data->path = gis_wms_fetch(map->wms, tile, GIS_ONCE, NULL, NULL);
+       g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);

        g_debug("GisPluginMap: _load_tile end %p", g_thread_self());
 }
 
        g_debug("GisPluginMap: _load_tile end %p", g_thread_self());
 }
 

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 5dc3c851e21499bf717e2f166e8e18e22dd35377..2d28da5ede3d7870dcb3a32084af80982ed8d9fb 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -39,18 +39,28 @@
 struct _LoadTileData {
        GisPluginSat *sat;
        GisTile      *tile;
 struct _LoadTileData {
        GisPluginSat *sat;
        GisTile      *tile;

-       GdkPixbuf    *pixbuf;
+       gchar        *path;

 };
 static gboolean _load_tile_cb(gpointer _data)
 {
        struct _LoadTileData *data = _data;
 };
 static gboolean _load_tile_cb(gpointer _data)
 {
        struct _LoadTileData *data = _data;

-       GisPluginSat *sat    = data->sat;
-       GisTile      *tile   = data->tile;
-       GdkPixbuf    *pixbuf = data->pixbuf;
+       GisPluginSat *sat  = data->sat;
+       GisTile      *tile = data->tile;
+       gchar        *path = data->path;

        g_free(data);
 
        g_free(data);
 

-       /* Create Texture */
+       /* Load pixbuf */

        g_debug("GisPluginSat: _load_tile_cb start");
        g_debug("GisPluginSat: _load_tile_cb start");

+       GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
+       if (!pixbuf) {
+               g_warning("GisPluginSat: _load_tile - Error loading pixbuf %s", path);
+               g_remove(path);
+               g_free(path);
+               return FALSE;
+       }
+       g_free(path);
+
+       /* Create Texture */

        guchar   *pixels = gdk_pixbuf_get_pixels(pixbuf);
        gboolean  alpha  = gdk_pixbuf_get_has_alpha(pixbuf);
        gint      width  = gdk_pixbuf_get_width(pixbuf);
        guchar   *pixels = gdk_pixbuf_get_pixels(pixbuf);
        gboolean  alpha  = gdk_pixbuf_get_has_alpha(pixbuf);
        gint      width  = gdk_pixbuf_get_width(pixbuf);


@@ -92,19 +102,11 @@ static void _load_tile(GisTile *tile, gpointer _sat)
 {
        GisPluginSat *sat = _sat;
        g_debug("GisPluginSat: _load_tile start %p", g_thread_self());
 {
        GisPluginSat *sat = _sat;
        g_debug("GisPluginSat: _load_tile start %p", g_thread_self());

-       char *path = gis_wms_fetch(sat->wms, tile, GIS_ONCE, NULL, NULL);

        struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
        struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);

-       data->sat   = sat;
-       data->tile   = tile;
-       data->pixbuf = gdk_pixbuf_new_from_file(path, NULL);
-       if (data->pixbuf) {
-               g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);
-       } else {
-               g_warning("GisPluginSat: _load_tile - Error loading pixbuf %s", path);
-               g_free(data);
-               g_remove(path);
-       }
-       g_free(path);
+       data->sat  = sat;
+       data->tile = tile;
+       data->path = gis_wms_fetch(sat->wms, tile, GIS_ONCE, NULL, NULL);
+       g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);

        g_debug("GisPluginSat: _load_tile end %p", g_thread_self());
 }
 
        g_debug("GisPluginSat: _load_tile end %p", g_thread_self());
 }