(GInstanceInitFunc)image_loader_init, /* instance_init */
NULL /* value_table */
};
- type = g_type_register_static(G_TYPE_OBJECT, "ImageLoaderType", &info, 0);
+ type = g_type_register_static(G_TYPE_OBJECT, "ImageLoaderType", &info, GTypeFlags(0));
}
return type;
}
static void image_loader_class_init_wrapper(void *data, void *UNUSED(user_data))
{
- image_loader_class_init(data);
+ image_loader_class_init(static_cast<ImageLoaderClass *>(data));
}
static void image_loader_class_init(ImageLoaderClass *loader_class)
{
if (*list)
{
- ImageLoaderAreaParam *prev_par = (*list)->data;
+ ImageLoaderAreaParam *prev_par = static_cast<ImageLoaderAreaParam *>((*list)->data);
if (prev_par->x == x && prev_par->w == w &&
prev_par->y + prev_par->h == y)
{
else
image_loader_backend_set_default(&il->backend);
- il->loader = il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il);
+ il->loader = static_cast<void **>(il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il));
#ifdef HAVE_TIFF
format = il->backend.get_format_name(il->loader);
return FALSE;
}
- il->mapped_file = mmap(0, il->bytes_total, PROT_READ|PROT_WRITE, MAP_PRIVATE, load_fd, 0);
+ il->mapped_file = static_cast<guchar *>(mmap(0, il->bytes_total, PROT_READ|PROT_WRITE, MAP_PRIVATE, load_fd, 0));
close(load_fd);
if (il->mapped_file == MAP_FAILED)
{
/**************************************************************************************/
/* execution via idle calls */
-static gboolean image_loader_idle_cb(gpointer data)
-{
- gboolean ret = FALSE;
- ImageLoader *il = static_cast<ImageLoader *>(data);
+//static gboolean image_loader_idle_cb(gpointer data)
+//{
+ //gboolean ret = FALSE;
+ //ImageLoader *il = static_cast<ImageLoader *>(data);
- if (il->idle_id)
- {
- ret = image_loader_continue(il);
- }
+ //if (il->idle_id)
+ //{
+ //ret = image_loader_continue(il);
+ //}
- if (!ret)
- {
- image_loader_stop_source(il);
- }
+ //if (!ret)
+ //{
+ //image_loader_stop_source(il);
+ //}
- return ret;
-}
+ //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 */
return ret;
}
+
+/**
+ * @FIXME this can be rather slow and blocks until the size is known
+ */
gboolean image_load_dimensions(FileData *fd, gint *width, gint *height)
{
+ ImageLoader *il;
gboolean success;
- gint width_file = 0;
- gint height_file = 0;
- gdk_pixbuf_get_file_info(fd->path, &width_file, &height_file);
+ il = image_loader_new(fd);
- if (width_file && height_file)
+ success = image_loader_start_idle(il);
+
+ if (success && il->pixbuf)
{
- *width = width_file;
- *height = height_file;
- success = TRUE;
+ if (width) *width = gdk_pixbuf_get_width(il->pixbuf);
+ if (height) *height = gdk_pixbuf_get_height(il->pixbuf);;
}
else
{
- *width = -1;
- *height = -1;
- success = FALSE;
+ if (width) *width = -1;
+ if (height) *height = -1;
}
+ image_loader_free(il);
+
return success;
}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */