From 9b0017904533399a1e323149d7b2fd758e17bc7e Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Tue, 5 Sep 2006 17:12:15 +0000 Subject: [PATCH] FTK change. Fixed Solaris compiler warnings. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@812 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- ftk/src/ftksys.h | 7 ++++++- ftk/util/ftktest.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ftk/src/ftksys.h b/ftk/src/ftksys.h index cc2413a..6bee0a1 100644 --- a/ftk/src/ftksys.h +++ b/ftk/src/ftksys.h @@ -542,8 +542,13 @@ return( f_atomicInc( &m_refCnt)); } + FLMINT FLMAPI Release( void) + { + return( Release( TRUE)); + } + FLMINT FLMAPI Release( - FLMBOOL bOkToReuse = TRUE); + FLMBOOL bOkToReuse); RCODE FLMAPI waitToComplete( void); diff --git a/ftk/util/ftktest.cpp b/ftk/util/ftktest.cpp index 2dcd45f..02b0acd 100644 --- a/ftk/util/ftktest.cpp +++ b/ftk/util/ftktest.cpp @@ -5116,9 +5116,10 @@ RCODE ftkTestText( void) for( uiLoop = 0; uiLoop <= 0xFFFF; uiLoop++) { - FLMUINT16 ui16WpChar = (FLMUINT16)uiLoop; FLMUINT uiLanguage; + ui16WpChar = (FLMUINT16)uiLoop; + for( uiLanguage = 0; uiLanguage < FLM_LAST_LANG; uiLanguage++) { if( f_wpGetCollation( ui16WpChar, uiLanguage) != @@ -5165,10 +5166,11 @@ RCODE ftkTestText( void) for( uiLoop = 0; uiLoop <= 0xFFFF; uiLoop++) { - FLMUINT16 ui16WpChar = (FLMUINT16)uiLoop; FLMUINT16 ui16DakutenOrHandakuten; FLMUINT16 ui16DakutenOrHandakuten2; + ui16WpChar = (FLMUINT16)uiLoop; + if( (ZenToHankaku( ui16WpChar, &ui16DakutenOrHandakuten) != f_wpZenToHankaku( ui16WpChar, &ui16DakutenOrHandakuten2)) || ui16DakutenOrHandakuten != ui16DakutenOrHandakuten) @@ -5185,11 +5187,12 @@ RCODE ftkTestText( void) for( uiLoop = 0; uiLoop <= 0xFFFF; uiLoop++) { - FLMUINT16 ui16WpChar = (FLMUINT16)uiLoop; FLMUINT16 ui16Zenkaku; FLMUINT16 ui16Zenkaku2; FLMUINT uiNextWpChar; + ui16WpChar = (FLMUINT16)uiLoop; + for( uiNextWpChar = 0x0B3D; uiNextWpChar <= 0x0B3E; uiNextWpChar++) { if( (HanToZenkaku( ui16WpChar, (FLMUINT16)uiNextWpChar, &ui16Zenkaku) !=