Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6f591aceafc1a0214966340813a626ee08aa022e
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6f591aceafc1a0214966340813a626ee08aa022e
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6f591aceafc1a0214966340813a626ee08aa022e
The branch, master has been updated
via 6f591aceafc1a0214966340813a626ee08aa022e (commit)
via a65186f7a880dffc516675202f8f8a0aaf0bfa75 (commit)
via a9c0441725142aa2e28baf94b8345505ae271f19 (commit)
via 16346898d16c3f6386279013488a3b13004f7123 (commit)
via 26cef7d444032b0d3cd408ee20c8ee105acedb63 (commit)
via 236e8612e0042a85bfce4776bf7d91ad1cdb5eeb (commit)
via 26b189af67e26ac5b1d689b815a3eaa18524ee6f (commit)
via 521440df7c420577a3e3baea9c57c0a4bf14ad64 (commit)
via 648fc87c14378c0187791caf1fe3f29d550359b5 (commit)
via 1d9526d44d1d031f80d25474c5f3d1b88f1e4626 (commit)
from a4cb24ed46e1893799a2426513c419a24143e531 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6f591aceafc1a0214966340813a626ee08aa022e
commit 6f591aceafc1a0214966340813a626ee08aa022e
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Include: Bitmap: Drop get_bpp from bitmap operation table.
Core bitmaps have always been 32bpp.
diff --git a/include/netsurf/bitmap.h b/include/netsurf/bitmap.h
index f5de514..d95a172 100644
--- a/include/netsurf/bitmap.h
+++ b/include/netsurf/bitmap.h
@@ -143,13 +143,6 @@ struct gui_bitmap_table {
int (*get_height)(void *bitmap);
/**
- * Get the *bytes* per pixel.
- *
- * \param bitmap The bitmap
- */
- size_t (*get_bpp)(void *bitmap);
-
- /**
* Save a bitmap to disc.
*
* \param bitmap The bitmap to save
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a65186f7a880dffc516675202f8f8a0aaf0bfa75
commit a65186f7a880dffc516675202f8f8a0aaf0bfa75
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
BeOS: Drop bitmap get bpp function.
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index c4b0087..6834192 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -216,20 +216,6 @@ static size_t bitmap_get_rowstride(void *vbitmap)
/**
- * Find the bytes per pixels of a bitmap.
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixels of the bitmap
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
-}
-
-
-/**
* Free pretiles of a bitmap.
*
* \param bitmap The bitmap to free the pretiles of.
@@ -548,7 +534,6 @@ static struct gui_bitmap_table bitmap_table = {
/*.get_rowstride =*/ bitmap_get_rowstride,
/*.get_width =*/ bitmap_get_width,
/*.get_height =*/ bitmap_get_height,
- /*.get_bpp =*/ bitmap_get_bpp,
/*.save =*/ bitmap_save,
/*.modified =*/ bitmap_modified,
/*.render =*/ bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a9c0441725142aa2e28baf94b8345505ae271f19
commit a9c0441725142aa2e28baf94b8345505ae271f19
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Atari: Drop bitmap get bpp function.
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index ae42da8..e627a32 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -358,22 +358,12 @@ int atari_bitmap_get_height(void *bitmap)
return(bm->height);
}
-
-/**
- * Gets the number of BYTES per pixel.
- */
-static size_t bitmap_get_bpp(void *bitmap)
-{
- struct bitmap *bm = bitmap;
- return bm->bpp;
-}
-
/* exported interface documented in atari/bitmap.h */
bool atari_bitmap_resize(struct bitmap *img, HermesHandle hermes_h,
HermesFormat *fmt, int nw, int nh)
{
unsigned int state = 0;
- short bpp = bitmap_get_bpp( img );
+ short bpp = img->bpp;
int stride = atari_bitmap_get_rowstride( img );
int err;
@@ -444,7 +434,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = atari_bitmap_get_rowstride,
.get_width = atari_bitmap_get_width,
.get_height = atari_bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=16346898d16c3f6386279013488a3b13004f7123
commit 16346898d16c3f6386279013488a3b13004f7123
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Amiga: Drop bitmap get bpp function.
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index e160f93..14ca3fa 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -367,20 +367,6 @@ int bitmap_get_height(void *bitmap)
}
}
-
-/**
- * Find the bytes per pixel of a bitmap
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixel
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
-}
-
static void ami_bitmap_argb_to_rgba(struct bitmap *bm)
{
if(bm == NULL) return;
@@ -436,7 +422,7 @@ Object *ami_datatype_object_from_bitmap(struct bitmap
*bitmap)
{
bmhd->bmh_Width = (UWORD)bitmap_get_width(bitmap);
bmhd->bmh_Height = (UWORD)bitmap_get_height(bitmap);
- bmhd->bmh_Depth = (UBYTE)bitmap_get_bpp(bitmap) * 8;
+ bmhd->bmh_Depth = (UBYTE)32;
if(!amiga_bitmap_get_opaque(bitmap)) bmhd->bmh_Masking
= mskHasAlpha;
}
@@ -829,7 +815,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = amiga_bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = amiga_bitmap_save,
.modified = amiga_bitmap_modified,
.render = bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=26cef7d444032b0d3cd408ee20c8ee105acedb63
commit 26cef7d444032b0d3cd408ee20c8ee105acedb63
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
GTK: Drop bitmap get bpp function.
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index e7b859d..5057533 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -284,22 +284,6 @@ static size_t bitmap_get_rowstride(void *vbitmap)
/**
- * Find the bytes per pixel of a bitmap
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixel
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *gbitmap = (struct bitmap *)vbitmap;
- assert(gbitmap);
-
- return 4;
-}
-
-
-
-/**
* Free a bitmap.
*
* \param vbitmap a bitmap, as returned by bitmap_create()
@@ -535,7 +519,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = nsgtk_bitmap_get_width,
.get_height = nsgtk_bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=236e8612e0042a85bfce4776bf7d91ad1cdb5eeb
commit 236e8612e0042a85bfce4776bf7d91ad1cdb5eeb
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Framebuffer: Drop bitmap get bpp function.
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index 1fc9f46..133ee12 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -251,12 +251,6 @@ static int bitmap_get_height(void *bitmap)
return(height);
}
-/* get bytes per pixel */
-static size_t bitmap_get_bpp(void *bitmap)
-{
- return 4;
-}
-
/**
* Render content into a bitmap.
*
@@ -337,7 +331,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=26b189af67e26ac5b1d689b815a3eaa18524ee6f
commit 26b189af67e26ac5b1d689b815a3eaa18524ee6f
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Monkey: Drop bitmap get bpp function.
diff --git a/frontends/monkey/bitmap.c b/frontends/monkey/bitmap.c
index e53b565..62b62eb 100644
--- a/frontends/monkey/bitmap.c
+++ b/frontends/monkey/bitmap.c
@@ -96,12 +96,6 @@ static size_t bitmap_get_rowstride(void *bitmap)
return bmap->width * 4;
}
-static size_t bitmap_get_bpp(void *bitmap)
-{
- /* OMG?! */
- return 4;
-}
-
static bool bitmap_save(void *bitmap, const char *path, unsigned flags)
{
return true;
@@ -142,7 +136,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=521440df7c420577a3e3baea9c57c0a4bf14ad64
commit 521440df7c420577a3e3baea9c57c0a4bf14ad64
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Windows: Drop bitmap get bpp function.
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index eed3d3a..ad78a2e 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -276,11 +276,6 @@ static int bitmap_get_height(void *bitmap)
return(bm->height);
}
-static size_t bitmap_get_bpp(void *bitmap)
-{
- return 4;
-}
-
struct bitmap *bitmap_scale(struct bitmap *prescale, int width, int height)
{
struct bitmap *ret = malloc(sizeof(struct bitmap));
@@ -380,7 +375,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=648fc87c14378c0187791caf1fe3f29d550359b5
commit 648fc87c14378c0187791caf1fe3f29d550359b5
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: Drop bitmap get bpp function.
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index d554d54..9de6c91 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -480,20 +480,6 @@ static int bitmap_get_height(void *vbitmap)
}
-/**
- * Find the bytes per pixel of a bitmap
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixel
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
-}
-
-
/* exported interface documented in riscos/bitmap.h */
void riscos_bitmap_overlay_sprite(struct bitmap *bitmap,
const osspriteop_header *s)
@@ -879,7 +865,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = riscos_bitmap_save,
.modified = bitmap_modified,
.render = riscos_bitmap_render,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1d9526d44d1d031f80d25474c5f3d1b88f1e4626
commit 1d9526d44d1d031f80d25474c5f3d1b88f1e4626
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
GUI: Bitmap bytes per pixel callback is not required now.
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index a141d7d..5888c17 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -580,10 +580,6 @@ static nserror verify_bitmap_register(struct
gui_bitmap_table *gbt)
return NSERROR_BAD_PARAMETER;
}
- if (gbt->get_bpp == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
-
if (gbt->save == NULL) {
return NSERROR_BAD_PARAMETER;
}
-----------------------------------------------------------------------
Summary of changes:
desktop/gui_factory.c | 4 ----
frontends/amiga/bitmap.c | 17 +----------------
frontends/atari/bitmap.c | 13 +------------
frontends/beos/bitmap.cpp | 15 ---------------
frontends/framebuffer/bitmap.c | 7 -------
frontends/gtk/bitmap.c | 17 -----------------
frontends/monkey/bitmap.c | 7 -------
frontends/riscos/bitmap.c | 15 ---------------
frontends/windows/bitmap.c | 6 ------
include/netsurf/bitmap.h | 7 -------
10 files changed, 2 insertions(+), 106 deletions(-)
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index a141d7d..5888c17 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -580,10 +580,6 @@ static nserror verify_bitmap_register(struct
gui_bitmap_table *gbt)
return NSERROR_BAD_PARAMETER;
}
- if (gbt->get_bpp == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
-
if (gbt->save == NULL) {
return NSERROR_BAD_PARAMETER;
}
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index e160f93..14ca3fa 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -367,20 +367,6 @@ int bitmap_get_height(void *bitmap)
}
}
-
-/**
- * Find the bytes per pixel of a bitmap
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixel
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
-}
-
static void ami_bitmap_argb_to_rgba(struct bitmap *bm)
{
if(bm == NULL) return;
@@ -436,7 +422,7 @@ Object *ami_datatype_object_from_bitmap(struct bitmap
*bitmap)
{
bmhd->bmh_Width = (UWORD)bitmap_get_width(bitmap);
bmhd->bmh_Height = (UWORD)bitmap_get_height(bitmap);
- bmhd->bmh_Depth = (UBYTE)bitmap_get_bpp(bitmap) * 8;
+ bmhd->bmh_Depth = (UBYTE)32;
if(!amiga_bitmap_get_opaque(bitmap)) bmhd->bmh_Masking
= mskHasAlpha;
}
@@ -829,7 +815,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = amiga_bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = amiga_bitmap_save,
.modified = amiga_bitmap_modified,
.render = bitmap_render,
diff --git a/frontends/atari/bitmap.c b/frontends/atari/bitmap.c
index ae42da8..e627a32 100644
--- a/frontends/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
@@ -358,22 +358,12 @@ int atari_bitmap_get_height(void *bitmap)
return(bm->height);
}
-
-/**
- * Gets the number of BYTES per pixel.
- */
-static size_t bitmap_get_bpp(void *bitmap)
-{
- struct bitmap *bm = bitmap;
- return bm->bpp;
-}
-
/* exported interface documented in atari/bitmap.h */
bool atari_bitmap_resize(struct bitmap *img, HermesHandle hermes_h,
HermesFormat *fmt, int nw, int nh)
{
unsigned int state = 0;
- short bpp = bitmap_get_bpp( img );
+ short bpp = img->bpp;
int stride = atari_bitmap_get_rowstride( img );
int err;
@@ -444,7 +434,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = atari_bitmap_get_rowstride,
.get_width = atari_bitmap_get_width,
.get_height = atari_bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index c4b0087..6834192 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -216,20 +216,6 @@ static size_t bitmap_get_rowstride(void *vbitmap)
/**
- * Find the bytes per pixels of a bitmap.
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixels of the bitmap
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
-}
-
-
-/**
* Free pretiles of a bitmap.
*
* \param bitmap The bitmap to free the pretiles of.
@@ -548,7 +534,6 @@ static struct gui_bitmap_table bitmap_table = {
/*.get_rowstride =*/ bitmap_get_rowstride,
/*.get_width =*/ bitmap_get_width,
/*.get_height =*/ bitmap_get_height,
- /*.get_bpp =*/ bitmap_get_bpp,
/*.save =*/ bitmap_save,
/*.modified =*/ bitmap_modified,
/*.render =*/ bitmap_render,
diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index 1fc9f46..133ee12 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -251,12 +251,6 @@ static int bitmap_get_height(void *bitmap)
return(height);
}
-/* get bytes per pixel */
-static size_t bitmap_get_bpp(void *bitmap)
-{
- return 4;
-}
-
/**
* Render content into a bitmap.
*
@@ -337,7 +331,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index e7b859d..5057533 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -284,22 +284,6 @@ static size_t bitmap_get_rowstride(void *vbitmap)
/**
- * Find the bytes per pixel of a bitmap
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixel
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *gbitmap = (struct bitmap *)vbitmap;
- assert(gbitmap);
-
- return 4;
-}
-
-
-
-/**
* Free a bitmap.
*
* \param vbitmap a bitmap, as returned by bitmap_create()
@@ -535,7 +519,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = nsgtk_bitmap_get_width,
.get_height = nsgtk_bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
diff --git a/frontends/monkey/bitmap.c b/frontends/monkey/bitmap.c
index e53b565..62b62eb 100644
--- a/frontends/monkey/bitmap.c
+++ b/frontends/monkey/bitmap.c
@@ -96,12 +96,6 @@ static size_t bitmap_get_rowstride(void *bitmap)
return bmap->width * 4;
}
-static size_t bitmap_get_bpp(void *bitmap)
-{
- /* OMG?! */
- return 4;
-}
-
static bool bitmap_save(void *bitmap, const char *path, unsigned flags)
{
return true;
@@ -142,7 +136,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
diff --git a/frontends/riscos/bitmap.c b/frontends/riscos/bitmap.c
index d554d54..9de6c91 100644
--- a/frontends/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
@@ -480,20 +480,6 @@ static int bitmap_get_height(void *vbitmap)
}
-/**
- * Find the bytes per pixel of a bitmap
- *
- * \param vbitmap a bitmap, as returned by bitmap_create()
- * \return bytes per pixel
- */
-static size_t bitmap_get_bpp(void *vbitmap)
-{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
-}
-
-
/* exported interface documented in riscos/bitmap.h */
void riscos_bitmap_overlay_sprite(struct bitmap *bitmap,
const osspriteop_header *s)
@@ -879,7 +865,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = riscos_bitmap_save,
.modified = bitmap_modified,
.render = riscos_bitmap_render,
diff --git a/frontends/windows/bitmap.c b/frontends/windows/bitmap.c
index eed3d3a..ad78a2e 100644
--- a/frontends/windows/bitmap.c
+++ b/frontends/windows/bitmap.c
@@ -276,11 +276,6 @@ static int bitmap_get_height(void *bitmap)
return(bm->height);
}
-static size_t bitmap_get_bpp(void *bitmap)
-{
- return 4;
-}
-
struct bitmap *bitmap_scale(struct bitmap *prescale, int width, int height)
{
struct bitmap *ret = malloc(sizeof(struct bitmap));
@@ -380,7 +375,6 @@ static struct gui_bitmap_table bitmap_table = {
.get_rowstride = bitmap_get_rowstride,
.get_width = bitmap_get_width,
.get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
.save = bitmap_save,
.modified = bitmap_modified,
.render = bitmap_render,
diff --git a/include/netsurf/bitmap.h b/include/netsurf/bitmap.h
index f5de514..d95a172 100644
--- a/include/netsurf/bitmap.h
+++ b/include/netsurf/bitmap.h
@@ -143,13 +143,6 @@ struct gui_bitmap_table {
int (*get_height)(void *bitmap);
/**
- * Get the *bytes* per pixel.
- *
- * \param bitmap The bitmap
- */
- size_t (*get_bpp)(void *bitmap);
-
- /**
* Save a bitmap to disc.
*
* \param bitmap The bitmap to save
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]