Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/bc8fee46f73307aba2f56... ...commit http://git.netsurf-browser.org/netsurf.git/commit/bc8fee46f73307aba2f567e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/bc8fee46f73307aba2f567ec1... The branch, master has been updated via bc8fee46f73307aba2f567ec1e35bd187b706eb8 (commit) via 4357f5e9d72b0f4efe939e02a7012fc60d43095d (commit) from 37d148f4d790cdfb756ea6348a15da8c3d75fdff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/bc8fee46f73307aba2f... commit bc8fee46f73307aba2f567ec1e35bd187b706eb8 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Fix scaled tiled image rendering. diff --git a/gtk/plotters.c b/gtk/plotters.c index fbf3d58..3af55b9 100644 --- a/gtk/plotters.c +++ b/gtk/plotters.c @@ -414,9 +414,6 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height, return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg); } - width = bitmap_get_width(bitmap); - height = bitmap_get_height(bitmap); - if (y > cliprect.y) { doneheight = (cliprect.y - height) + ((y - cliprect.y) % height); } else { commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/4357f5e9d72b0f4efe9... commit 4357f5e9d72b0f4efe939e02a7012fc60d43095d Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Test for zero width/height at the start. diff --git a/gtk/plotters.c b/gtk/plotters.c index 2f2b111..fbf3d58 100644 --- a/gtk/plotters.c +++ b/gtk/plotters.c @@ -404,6 +404,11 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height, bool repeat_x = (flags & BITMAPF_REPEAT_X); bool repeat_y = (flags & BITMAPF_REPEAT_Y); + /* Bail early if we can */ + if (width == 0 || height == 0) + /* Nothing to plot */ + return true; + if (!(repeat_x || repeat_y)) { /* Not repeating at all, so just pass it on */ return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg); @@ -412,11 +417,6 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height, width = bitmap_get_width(bitmap); height = bitmap_get_height(bitmap); - /* Bail early if we can */ - if (width == 0 || height == 0) - /* Nothing to plot */ - return true; - if (y > cliprect.y) { doneheight = (cliprect.y - height) + ((y - cliprect.y) % height); } else { ----------------------------------------------------------------------- Summary of changes: gtk/plotters.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk/plotters.c b/gtk/plotters.c index 2f2b111..3af55b9 100644 --- a/gtk/plotters.c +++ b/gtk/plotters.c @@ -404,19 +404,16 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height, bool repeat_x = (flags & BITMAPF_REPEAT_X); bool repeat_y = (flags & BITMAPF_REPEAT_Y); - if (!(repeat_x || repeat_y)) { - /* Not repeating at all, so just pass it on */ - return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg); - } - - width = bitmap_get_width(bitmap); - height = bitmap_get_height(bitmap); - /* Bail early if we can */ if (width == 0 || height == 0) /* Nothing to plot */ return true; + if (!(repeat_x || repeat_y)) { + /* Not repeating at all, so just pass it on */ + return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg); + } + if (y > cliprect.y) { doneheight = (cliprect.y - height) + ((y - cliprect.y) % height); } else { -- NetSurf Browser