From ea8a8770ea6e945f32d053450940a9ba5b7871a3 Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Wed, 24 Feb 2021 09:46:48 +0100 Subject: [PATCH] Do not use nullptr and add check --- lib/font_renderer/font_renderer.cpp | 2 +- src/renderer.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/font_renderer/font_renderer.cpp b/lib/font_renderer/font_renderer.cpp index d0f47f9a..c49426a8 100644 --- a/lib/font_renderer/font_renderer.cpp +++ b/lib/font_renderer/font_renderer.cpp @@ -221,7 +221,7 @@ FR_Bitmap *FR_Bake_Font_Bitmap(FR_Renderer *font_renderer, int font_height, i = i + 1; } - if (glyph_count == 0) return nullptr; + if (glyph_count == 0) return NULL; const int pixels_width = (x_size_sum / glyph_count) * 16; // dry run simulating pixel position to estimate required image's height diff --git a/src/renderer.c b/src/renderer.c index 0675a491..24eae283 100644 --- a/src/renderer.c +++ b/src/renderer.c @@ -107,6 +107,7 @@ static GlyphSet* load_glyphset(RenFont *font, int idx) { GlyphSet *set = check_alloc(calloc(1, sizeof(GlyphSet))); set->image = FR_Bake_Font_Bitmap(font->renderer, font->height, idx << 8, 256, set->glyphs); + check_alloc(set->image); /* adjust glyph's xadvance */ for (int i = 0; i < 256; i++) {