(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)
static gboolean image_loader_emit_area_ready_cb(gpointer data)
{
- ImageLoaderAreaParam *par = (ImageLoaderAreaParam *)data;
+ ImageLoaderAreaParam *par = static_cast<ImageLoaderAreaParam *>(data);
ImageLoader *il = par->il;
guint x, y, w, h;
g_mutex_lock(il->data_mutex);
g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, x, y, w, h);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static gboolean image_loader_emit_done_cb(gpointer data)
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
g_signal_emit(il, signals[SIGNAL_DONE], 0);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static gboolean image_loader_emit_error_cb(gpointer data)
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
g_signal_emit(il, signals[SIGNAL_ERROR], 0);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static gboolean image_loader_emit_percent_cb(gpointer data)
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
g_signal_emit(il, signals[SIGNAL_PERCENT], 0, image_loader_get_percent(il));
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static gboolean image_loader_emit_size_cb(gpointer data)
{
gint width, height;
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
g_mutex_lock(il->data_mutex);
width = il->actual_width;
height = il->actual_height;
g_mutex_unlock(il->data_mutex);
g_signal_emit(il, signals[SIGNAL_SIZE], 0, width, height);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
{
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)
{
guint x, guint y, guint w, guint h,
gpointer data)
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
if (!image_loader_get_pixbuf(il))
{
static void image_loader_area_prepared_cb(gpointer loader, gpointer data)
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
GdkPixbuf *pb;
guchar *pix;
size_t h, rs;
static void image_loader_size_cb(gpointer loader,
gint width, gint height, gpointer data)
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
gchar **mime_types;
gboolean scale = FALSE;
gint n;
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);
gint b;
gint c;
- if (!il) return FALSE;
+ if (!il) return G_SOURCE_REMOVE;
c = il->idle_read_loop_count ? il->idle_read_loop_count : 1;
while (c > 0 && !image_loader_get_stopping(il))
if (b == 0)
{
image_loader_done(il);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
if (b < 0 || (b > 0 && !il->backend.write(il->loader, il->mapped_file + il->bytes_read, b, &il->error)))
{
image_loader_error(il);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
il->bytes_read += b;
image_loader_emit_percent(il);
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
static gboolean image_loader_begin(ImageLoader *il)
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)
{
while (work)
{
- ImageLoaderAreaParam *par = (ImageLoaderAreaParam *)work->data;
+ ImageLoaderAreaParam *par = static_cast<ImageLoaderAreaParam *>(work->data);
work = work->next;
g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, par->x, par->y, par->w, par->h);
static gboolean image_loader_idle_cb(gpointer data)
{
- gboolean ret = FALSE;
- ImageLoader *il = (ImageLoader *)data;
+ gboolean ret = G_SOURCE_REMOVE;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
if (il->idle_id)
{
return ret;
}
-
static gboolean image_loader_start_idle(ImageLoader *il)
{
gboolean ret;
static void image_loader_thread_run(gpointer data, gpointer UNUSED(user_data))
{
- ImageLoader *il = (ImageLoader *)data;
+ ImageLoader *il = static_cast<ImageLoader *>(data);
gboolean cont;
gboolean err;
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: */