mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-27 07:58:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: break out stride calculation to new function

Browse source
This commit is contained in:
Daniel Eklöf 2019-08-18 17:59:43 +02:00
parent 8aa53d1508
commit 33b5210a6a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
font.c
View file

@ -10,6 +10,7 @@
#define LOG_MODULE "font" #define LOG_MODULE "font"
#define LOG_ENABLE_DBG 0 #define LOG_ENABLE_DBG 0
#include "log.h" #include "log.h"
#include "stride.h"
#define min(x, y) ((x) < (y) ? (x) : (y)) #define min(x, y) ((x) < (y) ? (x) : (y))
@ -392,8 +393,7 @@ glyph_for_wchar(struct font *font, wchar_t wc, struct glyph *glyph)
break; break;
} }
/* Calculate stride. Copied from cairoint.h:CAIRO_STRIDE_FOR_WIDTH_BPP */ int stride = stride_for_format_and_width(pix_format, width);
int stride = (((PIXMAN_FORMAT_BPP(pix_format) * width + 7) / 8 + 4 - 1) & -4);
assert(stride >= bitmap->pitch); assert(stride >= bitmap->pitch);
uint8_t *data = malloc(rows * stride); uint8_t *data = malloc(rows * stride);

6
shm.c
View file

@ -11,6 +11,7 @@
#define LOG_MODULE "shm" #define LOG_MODULE "shm"
#include "log.h" #include "log.h"
#include "stride.h"
#include "tllist.h" #include "tllist.h"
static tll(struct buffer) buffers; static tll(struct buffer) buffers;
@ -69,10 +70,7 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, size_t copies)
goto err; goto err;
} }
/* TODO: copied from font.c */ const int stride = stride_for_format_and_width(PIXMAN_a8r8g8b8, width);
/* Calculate stride. Copied from cairoint.h:CAIRO_STRIDE_FOR_WIDTH_BPP */
int bpp = 32;
const int stride = (((bpp * width + 7) / 8 + 4 - 1) & -4);
/* Total size */ /* Total size */
size = stride * height; size = stride * height;

9
stride.h Normal file
View file

@ -0,0 +1,9 @@
#pragma once
#include <pixman.h>
static inline int
stride_for_format_and_width(pixman_format_code_t format, int width)
{
return (((PIXMAN_FORMAT_BPP(format) * width + 7) / 8 + 4 - 1) & -4);
}