From cb441e44e527a41f0ab0470d2e308d9d3ecca35a Mon Sep 17 00:00:00 2001 From: Zhouyj_zju Date: Thu, 9 Mar 2023 14:56:30 +0800 Subject: [PATCH] Description: fix the cpp check IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I6LCDH Feature or Bugfix: Feature Binary Source:No Signed-off-by: zhouyj --- frameworks/draw/draw_utils.h | 2 +- frameworks/font/ui_font_vector.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/draw/draw_utils.h b/frameworks/draw/draw_utils.h index cf144e8..067eb81 100644 --- a/frameworks/draw/draw_utils.h +++ b/frameworks/draw/draw_utils.h @@ -131,7 +131,7 @@ struct TriangleEdge { TriangleEdge() {} TriangleEdge(int16_t x1, int16_t y1, int16_t duInt, int16_t dvInt); ~TriangleEdge(); -#if ENABLE_FIXED_POINT +#if defined(ENABLE_FIXED_POINT) && ENABLE_FIXED_POINT // parameters below are Q15 fixed-point number int64_t curX = 0; int64_t curY = 0; diff --git a/frameworks/font/ui_font_vector.cpp b/frameworks/font/ui_font_vector.cpp index 82fb68e..0832faa 100644 --- a/frameworks/font/ui_font_vector.cpp +++ b/frameworks/font/ui_font_vector.cpp @@ -780,7 +780,7 @@ int8_t UIFontVector::LoadGlyphIntoFace(uint16_t& fontId, uint8_t fontSize, uint3 { int32_t error; if (IsGlyphFont(unicode) != 0) { - if (fontId != GetFontId(unicode)) { + if (fontId > FONT_ID_MAX || fontId != GetFontId(unicode)) { return INVALID_RET_VALUE; } error = FT_Load_Glyph(ftFaces_[fontId], unicode & (0xFFFFFF), FT_LOAD_RENDER); -- GitLab