From: Vladimir Nadvornik Date: Sun, 10 Apr 2011 18:30:17 +0000 (+0200) Subject: compilation fixes X-Git-Tag: 1.1~48 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=7a8a4c7e4448572ba18d4ded8cf7e86dbd5bf8e7 compilation fixes --- diff --git a/src/image_load_jpeg.c b/src/image_load_jpeg.c index 484da8a9..6e9877ab 100644 --- a/src/image_load_jpeg.c +++ b/src/image_load_jpeg.c @@ -228,6 +228,7 @@ static void init_source (j_decompress_ptr cinfo) {} 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) { diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c index afc1bd9d..2949a260 100644 --- a/src/renderer-tiles.c +++ b/src/renderer-tiles.c @@ -157,6 +157,8 @@ static void rt_queue(RendererTiles *rt, gint x, gint y, gint w, gint h, 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 @@ static void rt_scroll(RendererTiles *rt, gint x_off, gint y_off) #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);