summaryrefslogtreecommitdiff
path: root/riscos/bitmap.c
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2008-08-12 03:49:34 +0000
committerJames Bursa <james@netsurf-browser.org>2008-08-12 03:49:34 +0000
commit33107b160f09bbb301791759b83d772c820c4813 (patch)
tree2b0a0293ddcc63a44a2d01421db1e3286aa5f753 /riscos/bitmap.c
parent4c8989a6db25de8b2d3bf7fff07489c05808122b (diff)
downloadnetsurf-33107b160f09bbb301791759b83d772c820c4813.tar.gz
netsurf-33107b160f09bbb301791759b83d772c820c4813.tar.bz2
Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from
svn://semichrome.net/branches/dynis/netsurf ........ r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line Move NetSurf's gifread.h to libnsgif ........ r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line Remove NetSurf's gifread.c (replaced by libnsgif) ........ r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line Added references to libnsgif where necessary; corrected function calls where callbacks were implemented ........ r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line Updated Makefile to compile with libnsgif ........ r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created ........ r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif ........ r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line Corrected param comments for bitmap_set_suspendable() ........ r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented ........ r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line Updated Makefile to compile with libnsbmp ........ r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp) ........ r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line Correct a silly mistake in nsbmp_bitmap_create ........ r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line Integrated the latest versions of libnsgif and libnsbmp into NetSurf ........ r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp ........ svn path=/trunk/netsurf/; revision=5071
Diffstat (limited to 'riscos/bitmap.c')
-rw-r--r--riscos/bitmap.c57
1 files changed, 42 insertions, 15 deletions
diff --git a/riscos/bitmap.c b/riscos/bitmap.c
index 613b93c8f..dd1271f2e 100644
--- a/riscos/bitmap.c
+++ b/riscos/bitmap.c
@@ -190,7 +190,7 @@ void bitmap_quit(void)
* \return an opaque struct bitmap, or NULL on memory exhaustion
*/
-struct bitmap *bitmap_create(int width, int height, unsigned int state)
+void *bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
@@ -305,7 +305,7 @@ void bitmap_overlay_sprite(struct bitmap *bitmap, const osspriteop_header *s)
dp_offset = bitmap_get_rowstride(bitmap) / 4;
- dp = (unsigned*)bitmap_get_buffer(bitmap);
+ dp = bitmap_get_buffer(bitmap);
if (!dp)
return;
sp = (byte*)s + s->image;
@@ -410,8 +410,9 @@ bool bitmap_initialise(struct bitmap *bitmap)
* \param bitmap a bitmap, as returned by bitmap_create()
* \param opaque whether the bitmap should be plotted opaque
*/
-void bitmap_set_opaque(struct bitmap *bitmap, bool opaque)
+void bitmap_set_opaque(void *vbitmap, bool opaque)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
assert(bitmap);
if (opaque)
@@ -427,10 +428,11 @@ void bitmap_set_opaque(struct bitmap *bitmap, bool opaque)
* \param bitmap a bitmap, as returned by bitmap_create()
* \return whether the bitmap is opaque
*/
-bool bitmap_test_opaque(struct bitmap *bitmap)
+bool bitmap_test_opaque(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
assert(bitmap);
- char *sprite = bitmap_get_buffer(bitmap);
+ unsigned char *sprite = bitmap_get_buffer(bitmap);
if (!sprite)
return false;
unsigned int width = bitmap_get_rowstride(bitmap);
@@ -464,8 +466,9 @@ bool bitmap_test_opaque(struct bitmap *bitmap)
*
* \param bitmap a bitmap, as returned by bitmap_create()
*/
-bool bitmap_get_opaque(struct bitmap *bitmap)
+bool bitmap_get_opaque(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
assert(bitmap);
return (bitmap->state & BITMAP_OPAQUE);
}
@@ -481,8 +484,9 @@ bool bitmap_get_opaque(struct bitmap *bitmap)
* of rows. The width of a row in bytes is given by bitmap_get_rowstride().
*/
-char *bitmap_get_buffer(struct bitmap *bitmap)
+unsigned char *bitmap_get_buffer(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
assert(bitmap);
/* move to the head of the list */
@@ -534,8 +538,9 @@ char *bitmap_get_buffer(struct bitmap *bitmap)
* \return width of a pixel row in the bitmap
*/
-size_t bitmap_get_rowstride(struct bitmap *bitmap)
+size_t bitmap_get_rowstride(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
return bitmap->width * 4;
}
@@ -546,8 +551,9 @@ size_t bitmap_get_rowstride(struct bitmap *bitmap)
* \param bitmap a bitmap, as returned by bitmap_create()
*/
-void bitmap_destroy(struct bitmap *bitmap)
+void bitmap_destroy(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
struct bitmap_compressed_header *header;
unsigned int area_size;
@@ -590,8 +596,9 @@ void bitmap_destroy(struct bitmap *bitmap)
* \return true on success, false on error and error reported
*/
-bool bitmap_save(struct bitmap *bitmap, const char *path, unsigned flags)
+bool bitmap_save(void *vbitmap, const char *path, unsigned flags)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
os_error *error;
if (!bitmap->sprite_area)
@@ -758,7 +765,8 @@ bool bitmap_save(struct bitmap *bitmap, const char *path, unsigned flags)
*
* \param bitmap a bitmap, as returned by bitmap_create()
*/
-void bitmap_modified(struct bitmap *bitmap) {
+void bitmap_modified(void *vbitmap) {
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
bitmap->state |= BITMAP_MODIFIED;
}
@@ -770,8 +778,9 @@ void bitmap_modified(struct bitmap *bitmap) {
* \param private_word a private word to be returned later
* \param invalidate the function to be called upon suspension
*/
-void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word,
- void (*invalidate)(struct bitmap *bitmap, void *private_word)) {
+void bitmap_set_suspendable(void *vbitmap, void *private_word,
+ void (*invalidate)(void *bitmap, void *private_word)) {
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
bitmap->private_word = private_word;
bitmap->invalidate = invalidate;
bitmap_suspendable++;
@@ -1153,13 +1162,31 @@ void bitmap_delete_file(struct bitmap *bitmap)
}
-int bitmap_get_width(struct bitmap *bitmap)
+int bitmap_get_width(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
return bitmap->width;
}
-int bitmap_get_height(struct bitmap *bitmap)
+int bitmap_get_height(void *vbitmap)
{
+ struct bitmap *bitmap = (struct bitmap *) vbitmap;
return bitmap->height;
}
+
+
+/**
+ * Find the bytes per pixel of a bitmap
+ *
+ * \param bitmap a bitmap, as returned by bitmap_create()
+ * \return bytes per pixel
+ */
+
+size_t bitmap_get_bpp(void *vbitmap)
+{
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ return 4;
+}
+