Simplify RISC OS bitmap plotter.

svn path=/trunk/netsurf/; revision=8196
This commit is contained in:
Michael Drake 2009-06-30 13:16:29 +00:00
parent aa26843411
commit 26cee820f1

View File

@ -499,8 +499,6 @@ bool ro_plot_bitmap(int x, int y, int width, int height,
bitmap_flags_t flags) bitmap_flags_t flags)
{ {
const uint8_t *buffer; const uint8_t *buffer;
bool repeat_x = (flags & BITMAPF_REPEAT_X);
bool repeat_y = (flags & BITMAPF_REPEAT_Y);
buffer = bitmap_get_buffer(bitmap); buffer = bitmap_get_buffer(bitmap);
if (!buffer) { if (!buffer) {
@ -508,7 +506,6 @@ bool ro_plot_bitmap(int x, int y, int width, int height,
return false; return false;
} }
if (!(repeat_x || repeat_y)) {
return image_redraw(bitmap->sprite_area, return image_redraw(bitmap->sprite_area,
ro_plot_origin_x + x * 2, ro_plot_origin_x + x * 2,
ro_plot_origin_y - y * 2, ro_plot_origin_y - y * 2,
@ -516,19 +513,8 @@ bool ro_plot_bitmap(int x, int y, int width, int height,
bitmap->width, bitmap->width,
bitmap->height, bitmap->height,
bg, bg,
false, false, false, flags & BITMAPF_REPEAT_X, flags & BITMAPF_REPEAT_Y,
bitmap_get_opaque(bitmap) ? IMAGE_PLOT_TINCT_OPAQUE : flags & BITMAPF_REPEAT_X || flags & BITMAPF_REPEAT_Y,
IMAGE_PLOT_TINCT_ALPHA);
}
return image_redraw(bitmap->sprite_area,
ro_plot_origin_x + x * 2,
ro_plot_origin_y - y * 2,
width, height,
bitmap->width,
bitmap->height,
bg,
repeat_x, repeat_y, true,
bitmap_get_opaque(bitmap) ? IMAGE_PLOT_TINCT_OPAQUE : bitmap_get_opaque(bitmap) ? IMAGE_PLOT_TINCT_OPAQUE :
IMAGE_PLOT_TINCT_ALPHA); IMAGE_PLOT_TINCT_ALPHA);
} }