From 46887dbe5149616ba8cebeb45039880d462b3519 Mon Sep 17 00:00:00 2001 From: pengyiqiang Date: Thu, 2 May 2024 00:03:30 +0800 Subject: [PATCH] feat(freetype): add invalid font descriptor print Signed-off-by: pengyiqiang --- src/libs/freetype/lv_freetype.c | 1 - src/libs/freetype/lv_freetype_private.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/freetype/lv_freetype.c b/src/libs/freetype/lv_freetype.c index aca6a1301..17ce03830 100755 --- a/src/libs/freetype/lv_freetype.c +++ b/src/libs/freetype/lv_freetype.c @@ -181,7 +181,6 @@ void lv_freetype_font_delete(lv_font_t * font) LV_ASSERT_NULL(font); lv_freetype_context_t * ctx = lv_freetype_get_context(); lv_freetype_font_dsc_t * dsc = (lv_freetype_font_dsc_t *)(font->dsc); - LV_ASSERT_NULL(dsc); LV_ASSERT_FREETYPE_FONT_DSC(dsc); lv_cache_release(ctx->cache_node_cache, dsc->cache_node_entry, NULL); diff --git a/src/libs/freetype/lv_freetype_private.h b/src/libs/freetype/lv_freetype_private.h index 976e54fea..be652be69 100755 --- a/src/libs/freetype/lv_freetype_private.h +++ b/src/libs/freetype/lv_freetype_private.h @@ -43,7 +43,8 @@ extern "C" { #define LV_ASSERT_FREETYPE_FONT_DSC(dsc) \ do { \ LV_ASSERT_NULL(dsc); \ - LV_ASSERT_MSG(LV_FREETYPE_FONT_DSC_HAS_MAGIC_NUM(dsc), "Invalid font descriptor"); \ + LV_ASSERT_FORMAT_MSG(LV_FREETYPE_FONT_DSC_HAS_MAGIC_NUM(dsc), \ + "Invalid font descriptor: 0x%" LV_PRIx32, (dsc)->magic_num); \ } while (0) #define FT_INT_TO_F26DOT6(x) ((x) << 6)