summaryrefslogtreecommitdiff
path: root/riscos/htmlredraw.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2004-09-04 16:41:28 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2004-09-04 16:41:28 +0000
commit101c87958dfeb769c697136d221a2a1c63929e65 (patch)
tree99108a4a5c4b182ca9d385a9fa0330a9a6e3ea03 /riscos/htmlredraw.c
parente223757e3504586f8c260991b81f8f62c3b75ffc (diff)
downloadnetsurf-101c87958dfeb769c697136d221a2a1c63929e65.tar.gz
netsurf-101c87958dfeb769c697136d221a2a1c63929e65.tar.bz2
[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
Diffstat (limited to 'riscos/htmlredraw.c')
-rw-r--r--riscos/htmlredraw.c17
1 files changed, 9 insertions, 8 deletions
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: