Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undid change of r44565: not taking hyphens into account entirely is a bad idea as we then recognize some junk as valid encodings and it even made our own unit test fail

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-30 23:12:39 +00:00
parent 788257c0a4
commit 893bf46069
1 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/common/fmapbase.cpp
View File

@@ -199,18 +199,18 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
{ wxT( "WINDOWS-1257" ),wxT( "CP-1257" ),wxT( "MS-1257" ),wxT( "IBM-1257" ),NULL },
{ wxT( "WINDOWS-437" ), wxT( "CP-437" ), wxT( "MS-437" ), wxT( "IBM-437" ), NULL },
{ wxT( "UTF-7" ), NULL },
{ wxT( "UTF-8" ), NULL },
{ wxT( "UTF-7" ), wxT("UTF7"), NULL },
{ wxT( "UTF-8" ), wxT("UTF8"), NULL },
#ifdef WORDS_BIGENDIAN
{ wxT( "UTF-16BE" ), wxT("UCS-2BE"), wxT( "UTF-16" ), wxT("UCS-2"), NULL },
{ wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL },
{ wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
{ wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
{ wxT( "UTF-16BE" ), wxT("UTF16BE"), wxT("UCS-2BE"), wxT("UCS2BE"), wxT("UTF-16"), wxT("UTF16"), wxT("UCS-2"), wxT("UCS2"), NULL },
{ wxT( "UTF-16LE" ), wxT("UTF16LE"), wxT("UCS-2LE"), wxT("UCS2LE"), NULL },
{ wxT( "UTF-32BE" ), wxT("UTF32BE"), wxT("UCS-4BE" ), wxT("UTF-32"), wxT("UTF32"), wxT("UCS-4"), wxT("UCS4"), NULL },
{ wxT( "UTF-32LE" ), wxT("UTF32LE"), wxT("UCS-4LE"), wxT("UCS4LE"), NULL },
#else // WORDS_BIGENDIAN
{ wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
{ wxT( "UTF-16LE" ), wxT("UCS-2LE"), wxT( "UTF-16" ), wxT("UCS-2"), NULL },
{ wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
{ wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
{ wxT("UTF-16BE"), wxT("UTF16BE"), wxT("UCS-2BE"), wxT("UCS2BE"), NULL },
{ wxT("UTF-16LE"), wxT("UTF16LE"), wxT("UCS-2LE"), wxT("UTF-16"), wxT("UTF16"), wxT("UCS-2"), wxT("UCS2"), NULL },
{ wxT("UTF-32BE"), wxT("UTF32BE"), wxT("UCS-4BE"), wxT("UCS4BE"), NULL },
{ wxT("UTF-32LE"), wxT("UTF32LE"), wxT("UCS-4LE"), wxT("UCS4LE"), wxT("UTF-32"), wxT("UTF32"), wxT("UCS-4"), wxT("UCS4"), NULL },
#endif // WORDS_BIGENDIAN
{ wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
@@ -516,18 +516,21 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
}
}
// check for known encoding name
const wxFontEncoding e = GetEncodingFromName(cs);
if ( e != wxFONTENCODING_MAX )
return e;
for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); ++i )
{
for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
{
if ( cs.CmpNoCase(*encName) == 0 )
return gs_encodings[i];
}
}
// deal with general encoding names of the form FOO-xxx
cs.MakeUpper();
if ( cs.Left(3) == wxT("ISO") )
{
// the dash is optional (or, to be exact, it is not, but many
// broken programs "forget" it in the output they generate)
// the dash is optional (or, to be exact, it is not, but
// several broken programs "forget" it)
const wxChar *p = cs.c_str() + 3;
if ( *p == wxT('-') )
p++;
@@ -722,28 +725,12 @@ wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name)
{
const size_t count = WXSIZEOF(gs_encodingNames);
// many charsets use hyphens in their names but some systems use the
// same names without hyphens (e.g. "UTF-8" and "UTF8" are both common)
// so to avoid bloating gs_encodingNames array too much recognize both
// versions with and without hyphens here
wxString nameNoHyphens(name);
if ( !nameNoHyphens.Replace(_T("-"), _T("")) )
{
// no replacement has been done, no need to compare twice
nameNoHyphens.clear();
}
for ( size_t i = 0; i < count; i++ )
{
for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
{
if ( name.CmpNoCase(*encName) == 0 ||
(!nameNoHyphens.empty() &&
nameNoHyphens.CmpNoCase(*encName) == 0) )
{
if ( name.CmpNoCase(*encName) == 0 )
return gs_encodings[i];
}
}
}