提交 7b647a48 编写于 作者: S suwenxiang

Description: Clean warnings

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I6UKO8
Feature or Bugfix: Bugfix
Binary Source: No
Signed-off-by: Nsuwenxiang <suwenxiang@huawei.com>
上级 4874a26c
...@@ -780,7 +780,7 @@ int8_t UIFontVector::LoadGlyphIntoFace(uint16_t& fontId, uint8_t fontSize, uint3 ...@@ -780,7 +780,7 @@ int8_t UIFontVector::LoadGlyphIntoFace(uint16_t& fontId, uint8_t fontSize, uint3
{ {
int32_t error; int32_t error;
if (IsGlyphFont(unicode) != 0) { if (IsGlyphFont(unicode) != 0) {
if (fontId > FONT_ID_MAX || fontId != GetFontId(unicode)) { if (fontId >= FONT_ID_MAX || fontId != GetFontId(unicode)) {
return INVALID_RET_VALUE; return INVALID_RET_VALUE;
} }
error = FT_Load_Glyph(ftFaces_[fontId], unicode & (0xFFFFFF), FT_LOAD_RENDER); error = FT_Load_Glyph(ftFaces_[fontId], unicode & (0xFFFFFF), FT_LOAD_RENDER);
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "graphic_config.h" #include "graphic_config.h"
#include "ui_test.h" #include "ui_test.h"
#if ENABLE_WINDOW #if defined(ENABLE_WINDOW) && ENABLE_WINDOW
namespace OHOS { namespace OHOS {
class TestUIDialogButtonListener; class TestUIDialogButtonListener;
class TestUIDialogOnCancelListener; class TestUIDialogOnCancelListener;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define UI_TEST_VECTOR_FONT_H #define UI_TEST_VECTOR_FONT_H
#include "graphic_config.h" #include "graphic_config.h"
#if ENABLE_VECTOR_FONT #if defined(ENABLE_VECTOR_FONT) && ENABLE_VECTOR_FONT
#include "ui_test.h" #include "ui_test.h"
#include "components/ui_scroll_view.h" #include "components/ui_scroll_view.h"
#include "font/ui_font.h" #include "font/ui_font.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册