mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2025-01-22 12:32:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94 from StaticSaga/trunk

Browse Source 
gterm+bmp: Fix and image sanity check
This commit is contained in:
mint 2021-07-10 14:06:32 +02:00 committed by GitHub
commit b5ef61f151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stage23/lib/bmp.c
View File

@ -40,7 +40,10 @@ int bmp_open_image(struct image *image, struct file_handle *file) {
if (memcmp(&header.bf_signature, "BM", 2) != 0)
return -1;
if ((header.bi_bpp < 8) | ((header.bi_bpp % 8) != 0))
if ((header.bi_bpp != 32) && (header.bi_bpp != 24))
return -1;
if (header.bi_compression)
return -1;
struct bmp_local *local = ext_mem_alloc(sizeof(struct bmp_local));

2
stage23/lib/gterm.c
View File

@ -156,7 +156,7 @@ __attribute__((always_inline)) static inline void genloop(int xstart, int xend,
// so you can set x = xstart * ratio, and increment by ratio at each iteration
case IMAGE_STRETCHED:
for (int y = ystart; y < yend; y++) {
int img_y = y * img_width / gterm_width; // calculate Y with full precision
int img_y = (y * img_height) / gterm_height; // calculate Y with full precision
int off = img_pitch * (img_height - 1 - img_y);
int canvas_off = gterm_width * y, fb_off = gterm_pitch / 4 * y;