Egalware/Include
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include :

Browse Source 
- aggiunto encode di stringhe da code a UTF-8
- modifica interfaccia Text.
This commit is contained in:
Dario Sassi
2014-06-09 08:28:52 +00:00
parent 04882c2326
commit 6f64c155c8
4 changed files with 81 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EGnStringDecoder.h
+29 -18
View File
@@ -71,14 +71,26 @@ CountCodePoints( const std::string& sString, int& nCount)
nCount = 0 ;
// ciclo sui byte della stringa UTF-8
bool bOk = true ;
uint32_t codepoint ;
uint32_t state = UTF8_ACCEPT ;
uint32_t stPrev = UTF8_ACCEPT ;
for ( unsigned int i = 0 ; i < sString.length() ; ++ i) {
if ( ! decode( &state, &codepoint, sString[i]))
switch ( decode( &state, &codepoint, sString[i])) {
case UTF8_ACCEPT :
++ nCount ;
break ;
case UTF8_REJECT :
bOk = false ;
state = UTF8_ACCEPT ;
if ( stPrev != UTF8_ACCEPT)
-- i ;
break ;
}
stPrev = state ;
}
return ( state == UTF8_ACCEPT) ;
return bOk ;
}
//-----------------------------------------------------------------------------
@@ -96,22 +108,21 @@ GetCodePoints( const std::string& sString, UINTVECTOR& vCode)
uint32_t stPrev = UTF8_ACCEPT ;
for ( unsigned int i = 0 ; i < sString.length() ; ++ i) {
switch ( decode( &state, &codepoint, sString[i])) {
case UTF8_ACCEPT :
// A properly encoded character has been found.
vCode.push_back( codepoint) ;
break ;
case UTF8_REJECT :
// The byte is invalid, replace it and restart.
vCode.push_back( 0xFFFD) ;
bOk = false ;
state = UTF8_ACCEPT ;
if ( stPrev != UTF8_ACCEPT)
-- i ;
break ;
}
stPrev = state ;
switch ( decode( &state, &codepoint, sString[i])) {
case UTF8_ACCEPT :
// A properly encoded character has been found.
vCode.push_back( codepoint) ;
break ;
case UTF8_REJECT :
// The byte is invalid, replace it and restart.
vCode.push_back( 0xFFFD) ;
bOk = false ;
state = UTF8_ACCEPT ;
if ( stPrev != UTF8_ACCEPT)
-- i ;
break ;
}
stPrev = state ;
}
return bOk ;