mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-26 00:09:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bitmap: Convert pixel_to_colour to layout-aware function.

Browse Source
This commit is contained in:
Michael Drake 2022-03-26 15:11:32 +00:00
parent d00c049d02
commit aeead57677
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
desktop/bitmap.h
View File

@ -25,11 +25,9 @@
#include <nsutils/endian.h>
#include "netsurf/types.h"
#include "netsurf/bitmap.h"
/** The client bitmap format. */
extern bitmap_fmt_t bitmap_fmt;
/** Pixel format: colour component order. */
struct bitmap_colour_layout {
uint8_t r; /**< Byte offset within pixel to red component. */
@ -38,6 +36,12 @@ struct bitmap_colour_layout {
uint8_t a; /**< Byte offset within pixel to alpha component. */
};
/** The client bitmap format. */
extern bitmap_fmt_t bitmap_fmt;
/** The client bitmap colour channel layout. */
extern struct bitmap_colour_layout bitmap_layout;
/**
* Get the colour layout for the given bitmap format.
*
@ -84,9 +88,21 @@ static inline struct bitmap_colour_layout bitmap__get_colour_layout(
}
}
/* get a bitmap pixel (image/bitmap.h) into a plot colour */
#define bitmap_pixel_to_colour(b) \
b[0] | (b[1] << 8) | (b[2] << 16) | (b[3] << 24)
/**
* Convert a bitmap pixel to a NetSurf colour (0xAARRGGBB).
*
* The bitmap must be in the client format.
*
* \param[in] Pointer to a pixel in the bitmap's pixel data.
* \return The corresponding NetSurf colour.
*/
static inline colour bitmap_pixel_to_colour(const uint8_t *pixel)
{
return (pixel[bitmap_layout.r] << 0) |
(pixel[bitmap_layout.g] << 8) |
(pixel[bitmap_layout.b] << 16) |
(pixel[bitmap_layout.a] << 24);
}
/**
* Sanitise bitmap pixel component layout.