mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-02-16 20:42:49 by jmb] 

Remove hard-coded sprite offset nastiness.
Why this ever worked is confusing...

svn path=/import/netsurf/; revision=554
This commit is contained in:
John Mark Bell 2004-02-16 20:42:49 +00:00
parent 40ed6968b7
commit 2e52ee380c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
riscos/gif.c
View File

@ -76,7 +76,8 @@ int nsgif_convert(struct content *c, unsigned int iwidth, unsigned int iheight)
}
c->data.gif.sprite_area = area;
header = (osspriteop_header*)(c->data.gif.sprite_area + 1);
header = (osspriteop_header*)((char*)c->data.gif.sprite_area +
c->data.gif.sprite_area->first);
f = a->pFrames + 0;
img = (pixel*)header + header->image;
mask = (pixel*)header + header->mask;
@ -140,14 +141,16 @@ void nsgif_redraw(struct content *c, long x, long y,
xcolourtrans_generate_table_for_sprite(c->data.gif.sprite_area,
(osspriteop_id) (c->data.gif.sprite_area + 1),
(osspriteop_id) ((char*)c->data.gif.sprite_area +
c->data.gif.sprite_area->first),
colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE,
0, colourtrans_GIVEN_SPRITE, 0, 0, &size);
table = xcalloc(size, 1);
xcolourtrans_generate_table_for_sprite(c->data.gif.sprite_area,
(osspriteop_id) (c->data.gif.sprite_area + 1),
(osspriteop_id) ((char*)c->data.gif.sprite_area +
c->data.gif.sprite_area->first),
colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE,
table, colourtrans_GIVEN_SPRITE, 0, 0, 0);
@ -158,7 +161,8 @@ void nsgif_redraw(struct content *c, long x, long y,
xosspriteop_put_sprite_scaled(osspriteop_PTR,
c->data.gif.sprite_area,
(osspriteop_id) (c->data.gif.sprite_area + 1),
(osspriteop_id) ((char*)c->data.gif.sprite_area +
c->data.gif.sprite_area->first),
x, (int)(y - height),
/* osspriteop_USE_PALETTE is RO 3.5+ only.
* behaviour on RO < 3.5 is unknown...

9
riscos/jpeg.c
View File

@ -349,20 +349,23 @@ void nsjpeg_redraw(struct content *c, long x, long y,
}
xcolourtrans_generate_table_for_sprite(c->data.jpeg.sprite_area,
(osspriteop_id) (c->data.jpeg.sprite_area + 1),
(osspriteop_id) ((char*)c->data.jpeg.sprite_area +
c->data.jpeg.sprite_area->first),
colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE,
0, colourtrans_GIVEN_SPRITE, 0, 0, &size);
table = xcalloc(size, 1);
xcolourtrans_generate_table_for_sprite(c->data.jpeg.sprite_area,
(osspriteop_id) (c->data.jpeg.sprite_area + 1),
(osspriteop_id) ((char*)c->data.jpeg.sprite_area +
c->data.jpeg.sprite_area->first),
colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE,
table, colourtrans_GIVEN_SPRITE, 0, 0, 0);
xosspriteop_put_sprite_scaled(osspriteop_PTR,
c->data.jpeg.sprite_area,
(osspriteop_id) (c->data.jpeg.sprite_area + 1),
(osspriteop_id) ((char*)c->data.jpeg.sprite_area +
c->data.jpeg.sprite_area->first),
x, (int)(y - height),
/* osspriteop_USE_PALETTE is RO 3.5+ only.
* behaviour on RO < 3.5 is unknown...