Mercurial > hg > forks > geeqie
changeset 1857:afcbbc7f17a9
compilation fixes
author | Vladimir Nadvornik <nadvornik@suse.cz> |
---|---|
date | Sun, 10 Apr 2011 20:30:17 +0200 |
parents | 25ad4fcd970d |
children | bba0f67aae5d |
files | src/image_load_jpeg.c src/renderer-tiles.c |
diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image_load_jpeg.c Sat Apr 09 19:27:43 2011 +0200 +++ b/src/image_load_jpeg.c Sun Apr 10 20:30:17 2011 +0200 @@ -228,6 +228,7 @@ static boolean fill_input_buffer (j_decompress_ptr cinfo) { ERREXIT(cinfo, JERR_INPUT_EMPTY); + return TRUE; } static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
--- a/src/renderer-tiles.c Sat Apr 09 19:27:43 2011 +0200 +++ b/src/renderer-tiles.c Sun Apr 10 20:30:17 2011 +0200 @@ -157,6 +157,8 @@ static void rt_hierarchy_changed_cb(GtkWidget *widget, GtkWidget *previous_toplevel, gpointer data); static gint rt_queue_draw_idle_cb(gpointer data); +static void renderer_redraw(void *renderer, gint x, gint y, gint w, gint h, + gint clamp, ImageRenderType render, gboolean new_data, gboolean only_existing); #define GET_RIGHT_PIXBUF_OFFSET(rt) \ (( (rt->stereo_mode & PR_STEREO_RIGHT) && !(rt->stereo_mode & PR_STEREO_SWAP)) || \ @@ -1960,8 +1962,9 @@ #if ! GTK_CHECK_VERSION(2,18,0) while ((event = gdk_event_get_graphics_expose(box->window)) != NULL) { - pixbuf_renderer_paint(pr, &event->expose.area); - + renderer_redraw((void *) rt, event->expose.area.x, event->expose.area.y, event->expose.area.width, event->expose.area.height, + FALSE, TILE_RENDER_ALL, FALSE, FALSE); + if (event->expose.count == 0) { gdk_event_free(event);