From 33b5210a6a69c04c8de7589ac8c0b86c38ce75c3 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 18 Aug 2019 17:59:43 +0200 Subject: refactor: break out stride calculation to new function --- font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'font.c') diff --git a/font.c b/font.c index 17c66e1e..816b7e37 100644 --- a/font.c +++ b/font.c @@ -10,6 +10,7 @@ #define LOG_MODULE "font" #define LOG_ENABLE_DBG 0 #include "log.h" +#include "stride.h" #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; } - /* Calculate stride. Copied from cairoint.h:CAIRO_STRIDE_FOR_WIDTH_BPP */ - int stride = (((PIXMAN_FORMAT_BPP(pix_format) * width + 7) / 8 + 4 - 1) & -4); + int stride = stride_for_format_and_width(pix_format, width); assert(stride >= bitmap->pitch); uint8_t *data = malloc(rows * stride); -- cgit v1.3