Fix runtime error
[geeqie.git] / src / renderer-clutter.c
index f379130..3937275 100644 (file)
@@ -302,7 +302,7 @@ static gboolean rc_area_changed_cb(gpointer data)
 
                update_display_pixbuf(rc);
 
-               if (pr->func_post_process)
+               if (pr->func_post_process && pr->pixbuf)
                        {
                        pr->func_post_process(pr, &rc->display_pixbuf, 0, 0, gdk_pixbuf_get_width(pr->pixbuf), gdk_pixbuf_get_height(pr->pixbuf), pr->post_process_user_data);
                        }
@@ -405,7 +405,7 @@ static void update_display_pixbuf(RendererClutter *rc)
                                rc->display_pixbuf = gdk_pixbuf_composite_color_simple (tmppixbuf,
                                                gdk_pixbuf_get_width(pr->pixbuf),
                                                gdk_pixbuf_get_height(pr->pixbuf),
-                                               GDK_INTERP_HYPER,
+                                               GDK_INTERP_BILINEAR,
                                                255,
                                                PR_ALPHA_CHECK_SIZE,
                                                ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +
@@ -421,7 +421,7 @@ static void update_display_pixbuf(RendererClutter *rc)
                                rc->display_pixbuf = gdk_pixbuf_composite_color_simple (pr->pixbuf,
                                                gdk_pixbuf_get_width(pr->pixbuf),
                                                gdk_pixbuf_get_height(pr->pixbuf),
-                                               GDK_INTERP_HYPER,
+                                               GDK_INTERP_BILINEAR,
                                                255,
                                                PR_ALPHA_CHECK_SIZE,
                                                ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +
@@ -466,7 +466,7 @@ static void rc_update_pixbuf(void *renderer, gboolean lazy)
 
                        if (width != prev_width || height != prev_height)
                                {
-                               /* FIXME use CoglMaterial with multiple textures for background, color management, anaglyph, ... */
+                               /** @FIXME use CoglMaterial with multiple textures for background, color management, anaglyph, ... */
                                CoglHandle texture = cogl_texture_new_with_size(width,
                                                                                height,
                                                                                COGL_TEXTURE_NO_AUTO_MIPMAP,