From ca5b3bbedcc268cf5e777115749a152c6d225450 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 15 Jul 2008 09:12:25 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88=E5=9C=A7?= =?UTF-8?q?=E7=B8=AE=E3=83=86=E3=82=B9=E3=83=88:SDK=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=B3=E3=83=88=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=B9=E4=BF=AE=E6=AD=A3=E3=81=AB=E5=90=88=E3=82=8F?= =?UTF-8?q?=E3=81=9B=E3=81=A6=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E3=81=AE?= =?UTF-8?q?sharedFont.h=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=E3=83=8F?= =?UTF-8?q?=E3=83=95=E3=83=9E=E3=83=B3=E7=AC=A6=E5=8F=B7=E3=81=AB=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1903 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../testLoadSpeed/copy_to_sdk/sharedFont.h | 4 ++-- .../compressSharedFontLoad/testLoadSpeed/src/loadSharedFont.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/tests/compressSharedFontLoad/testLoadSpeed/copy_to_sdk/sharedFont.h b/build/tests/compressSharedFontLoad/testLoadSpeed/copy_to_sdk/sharedFont.h index b29a5ea0..98447dda 100644 --- a/build/tests/compressSharedFontLoad/testLoadSpeed/copy_to_sdk/sharedFont.h +++ b/build/tests/compressSharedFontLoad/testLoadSpeed/copy_to_sdk/sharedFont.h @@ -29,9 +29,9 @@ extern "C" { // 共有フォントインデックス typedef enum OSSharedFontIndex { - OS_SHARED_FONT_WW_S = 0, + OS_SHARED_FONT_WW_L = 0, OS_SHARED_FONT_WW_M = 1, - OS_SHARED_FONT_WW_L = 2, + OS_SHARED_FONT_WW_S = 2, OS_SHARED_FONT_MAX = 3 }OSSharedFontIndex; diff --git a/build/tests/compressSharedFontLoad/testLoadSpeed/src/loadSharedFont.c b/build/tests/compressSharedFontLoad/testLoadSpeed/src/loadSharedFont.c index ed16cf96..9b674328 100644 --- a/build/tests/compressSharedFontLoad/testLoadSpeed/src/loadSharedFont.c +++ b/build/tests/compressSharedFontLoad/testLoadSpeed/src/loadSharedFont.c @@ -133,7 +133,9 @@ void LoadSharedFont( STicks *pTicks ) OS_TPrintf( " uncompress font\n" ); #if (FORWARD_COMPRESS==1) //comperr = MI_SecureUncompressLZ( s_pCompressedBuffer[i], (u32)compsize, s_pFontBuffer[i], (u32)origsize ); - comperr = MI_SecureUncompressHuffman( s_pCompressedBuffer[i], (u32)compsize, s_pFontBuffer[i], (u32)origsize ); + //comperr = MI_SecureUncompressHuffman( s_pCompressedBuffer[i], (u32)compsize, s_pFontBuffer[i], (u32)origsize ); + MI_UncompressHuffman( s_pCompressedBuffer[i], s_pFontBuffer[i] ); + comperr = MI_ERR_SUCCESS; #else comperr = MI_SecureUncompressBLZ( s_pFontBuffer[i], (u32)compsize, (u32)origsize ); #endif