From 101c87958dfeb769c697136d221a2a1c63929e65 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 4 Sep 2004 16:41:28 +0000 Subject: [project @ 2004-09-04 16:41:28 by jmb] Fix jpeg redraw Move png.c/h to /image and rework to use the bitmap code Make RISC OS bitmap struct publically accessible (via riscos/bitmap.h) Draw export now embeds JPEGs and PNGs/MNGs/JNGs correctly again. Background images are now plotted correctly again. svn path=/import/netsurf/; revision=1268 --- riscos/htmlredraw.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'riscos/htmlredraw.c') diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c index 20d50fb5f..6dfc0b220 100644 --- a/riscos/htmlredraw.c +++ b/riscos/htmlredraw.c @@ -25,6 +25,7 @@ #include "netsurf/render/font.h" #include "netsurf/render/form.h" #include "netsurf/render/html.h" +#include "netsurf/riscos/bitmap.h" #include "netsurf/riscos/gui.h" #include "netsurf/riscos/image.h" #include "netsurf/riscos/options.h" @@ -1010,38 +1011,38 @@ bool html_redraw_background(int xi, int yi, int width, int height, /* and plot the image */ switch (box->background->type) { #ifdef WITH_PNG - case CONTENT_PNG:/* - image_redraw(box->background->data.png.sprite_area, + case CONTENT_PNG: + image_redraw(&box->background->bitmap->sprite_area, x, y, image_width, image_height, box->background->width * 2, box->background->height * 2, background_colour, repeat_x, repeat_y, - IMAGE_PLOT_TINCT_ALPHA);*/ + IMAGE_PLOT_TINCT_ALPHA); break; #endif #ifdef WITH_MNG case CONTENT_JNG: case CONTENT_MNG: - /*image_redraw(box->background->data.mng.sprite_area, + image_redraw(&box->background->bitmap->sprite_area, x, y, image_width, image_height, box->background->width * 2, box->background->height * 2, background_colour, repeat_x, repeat_y, - IMAGE_PLOT_TINCT_ALPHA);*/ + IMAGE_PLOT_TINCT_ALPHA); break; #endif #ifdef WITH_JPEG - case CONTENT_JPEG:/* - image_redraw(box->background->data.jpeg.sprite_area, + case CONTENT_JPEG: + image_redraw(&box->background->bitmap->sprite_area, x, y, image_width, image_height, box->background->width * 2, box->background->height * 2, background_colour, repeat_x, repeat_y, IMAGE_PLOT_TINCT_OPAQUE); - */break; + break; #endif #ifdef WITH_GIF case CONTENT_GIF: -- cgit v1.2.3