mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-20 00:14:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bitmap: Move bitmap pixel to colour macro to bitmap header.

Browse Source
This commit is contained in:
Michael Drake 2022-03-26 14:41:12 +00:00
parent 1bbb499f88
commit d00c049d02
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/handlers/image/image.c
View File

@ -26,6 +26,7 @@
#include "netsurf/bitmap.h"
#include "netsurf/content.h"
#include "desktop/gui_internal.h"
#include "desktop/bitmap.h"
#include "image/bmp.h"
#include "image/gif.h"
@ -124,7 +125,7 @@ bool image_bitmap_plot(struct bitmap *bitmap,
if (height == 1) {
/* optimise 1x1 bitmap plot */
pixel = guit->bitmap->get_buffer(bitmap);
fill_style.fill_colour = pixel_to_colour(pixel);
fill_style.fill_colour = bitmap_pixel_to_colour(pixel);
if (guit->bitmap->get_opaque(bitmap) ||
((fill_style.fill_colour & 0xff000000) == 0xff000000)) {

4
desktop/bitmap.h
View File

@ -84,6 +84,10 @@ 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)
/**
* Sanitise bitmap pixel component layout.
*

4
include/netsurf/plot_style.h
View File

@ -201,10 +201,6 @@ typedef struct plot_font_style {
(((((c1 & 0x00ff00) * (255 - p)) + \
((c0 & 0x00ff00) * ( p)) ) >> 8) & 0x00ff00))
/* get a bitmap pixel (image/bitmap.h) into a plot colour */
#define pixel_to_colour(b) \
b[0] | (b[1] << 8) | (b[2] << 16) | (b[3] << 24)
/* Get the red channel from a colour */
#define red_from_colour(c) \
((c ) & 0xff)