From: Colin Clark Date: Fri, 12 May 2023 09:01:28 +0000 (+0100) Subject: Revert "FIXME: this can be rather slow and blocks until the size is known" X-Git-Tag: v2.1~54 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=254b0fcb9f3c7afbb5aeedb6546115b788ce98a2 Revert "FIXME: this can be rather slow and blocks until the size is known" This reverts commit 8aeeb06fa5ab39f9e58938c2a8af3029fd67cbff. Uncomment the callbacks. --- diff --git a/src/image-load.cc b/src/image-load.cc index 03582d1a..d8395cd1 100644 --- a/src/image-load.cc +++ b/src/image-load.cc @@ -1156,40 +1156,39 @@ void image_loader_delay_area_ready(ImageLoader *il, gboolean enable) /**************************************************************************************/ /* execution via idle calls */ -//static gboolean image_loader_idle_cb(gpointer data) -//{ - //gboolean ret = FALSE; - //ImageLoader *il = static_cast(data); - - //if (il->idle_id) - //{ - //ret = image_loader_continue(il); - //} +static gboolean image_loader_idle_cb(gpointer data) +{ + gboolean ret = FALSE; + ImageLoader *il = static_cast(data); - //if (!ret) - //{ - //image_loader_stop_source(il); - //} + if (il->idle_id) + { + ret = image_loader_continue(il); + } - //return ret; -//} + if (!ret) + { + image_loader_stop_source(il); + } + return ret; +} -//static gboolean image_loader_start_idle(ImageLoader *il) -//{ - //gboolean ret; +static gboolean image_loader_start_idle(ImageLoader *il) +{ + gboolean ret; - //if (!il) return FALSE; + if (!il) return FALSE; - //if (!il->fd) return FALSE; + if (!il->fd) return FALSE; - //if (!image_loader_setup_source(il)) return FALSE; + if (!image_loader_setup_source(il)) return FALSE; - //ret = image_loader_begin(il); + ret = image_loader_begin(il); - //if (ret && !il->done) il->idle_id = g_idle_add_full(il->idle_priority, image_loader_idle_cb, il, NULL); - //return ret; -//} + if (ret && !il->done) il->idle_id = g_idle_add_full(il->idle_priority, image_loader_idle_cb, il, NULL); + return ret; +} /**************************************************************************************/ /* execution via thread */