diff --git a/build/tests/CheckSharedFont/src/loadSharedFont.c b/build/tests/CheckSharedFont/src/loadSharedFont.c index 04f9fe7e..6d858c85 100644 --- a/build/tests/CheckSharedFont/src/loadSharedFont.c +++ b/build/tests/CheckSharedFont/src/loadSharedFont.c @@ -27,9 +27,9 @@ // function's prototype------------------------------------------------------- // global variable------------------------------------------------------------- -BOOL g_isSucceededLoad[ OS_SHARED_FONT_CN_KR_MAX ]; +BOOL g_isSucceededLoad[ OS_SHARED_FONT_CN_KR_MAX + 1 ]; -const char *str_fontname[ OS_SHARED_FONT_CN_KR_MAX ] = { +const char *str_fontname[ OS_SHARED_FONT_CN_KR_MAX + 1 ] = { "SHARE_FONT_WW_L", "SHARE_FONT_WW_M", "SHARE_FONT_WW_S", @@ -39,13 +39,14 @@ const char *str_fontname[ OS_SHARED_FONT_CN_KR_MAX ] = { "SHARE_FONT_KR_L", "SHARE_FONT_KR_M", "SHARE_FONT_KR_S", + "SHARE_FONT_CN_KR_MAX", }; // static variable------------------------------------------------------------- static u64 s_fontLoadThreadStack[THREAD_STACK_SIZE / sizeof(u64)]; static OSThread s_fontLoadThread; static OSTick s_fontLoadStartTick; -static u8 *s_pFontBuffer[ OS_SHARED_FONT_CN_KR_MAX ]; // 読み込みはテストなのでロード先はstatic変数にしている。 +static u8 *s_pFontBuffer[ OS_SHARED_FONT_CN_KR_MAX + 1 ]; // 読み込みはテストなのでロード先はstatic変数にしている。 static BOOL s_isStarted = FALSE; // const data------------------------------------------------------------------ @@ -102,7 +103,7 @@ void LoadSharedFontThread( void *arg ) BOOL retval = TRUE; OSSharedFontIndex i; - for( i = OS_SHARED_FONT_WW_L; i < OS_SHARED_FONT_CN_KR_MAX; i++ ) { + for( i = OS_SHARED_FONT_WW_L; i < OS_SHARED_FONT_CN_KR_MAX + 1; i++ ) { int size; OS_TPrintf( "%s read.\n", str_fontname[ i ] ); diff --git a/build/tests/CheckSharedFont/src/loadSharedFont.h b/build/tests/CheckSharedFont/src/loadSharedFont.h index ffac83a1..fb350e47 100644 --- a/build/tests/CheckSharedFont/src/loadSharedFont.h +++ b/build/tests/CheckSharedFont/src/loadSharedFont.h @@ -27,8 +27,8 @@ extern "C" { // define data------------------------------------------------------- // global variables-------------------------------------------------- -extern BOOL g_isSucceededLoad[ OS_SHARED_FONT_CN_KR_MAX ]; -extern const char *str_fontname[ OS_SHARED_FONT_CN_KR_MAX ]; +extern BOOL g_isSucceededLoad[ OS_SHARED_FONT_CN_KR_MAX + 1 ]; +extern const char *str_fontname[ OS_SHARED_FONT_CN_KR_MAX + 1 ]; // function---------------------------------------------------------- BOOL LoadSharedFontInit( void ); diff --git a/build/tests/CheckSharedFont/src/main.c b/build/tests/CheckSharedFont/src/main.c index 4c76ad62..0d2f9185 100644 --- a/build/tests/CheckSharedFont/src/main.c +++ b/build/tests/CheckSharedFont/src/main.c @@ -81,8 +81,8 @@ void NitroMain(void) DEMOFillRect(0, 0, GX_LCD_SIZE_X, GX_LCD_SIZE_Y, DEMO_RGB_CLEAR); DEMOSetBitmapTextColor(GX_RGBA(0, 31, 0, 1)); DEMOSetBitmapTextColor(GX_RGBA(31, 31, 31, 1)); - DEMODrawFrame(ox, oy, 240, 10 + OS_SHARED_FONT_CN_KR_MAX * 10, GX_RGBA( 0, 31, 0, 1)); - for (i = 0; i < OS_SHARED_FONT_CN_KR_MAX; ++i) + DEMODrawFrame(ox, oy, 240, 10 + ( OS_SHARED_FONT_CN_KR_MAX + 1 ) * 10, GX_RGBA( 0, 31, 0, 1)); + for (i = 0; i < OS_SHARED_FONT_CN_KR_MAX + 1; ++i) { DEMODrawText(ox + 10, oy + 5 + i * 10, "%s load %s", str_fontname[ i ], g_isSucceededLoad[ i ] ? "suceeded" : "failed");