hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 00:14:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

fix: dsl ann file codec detection

Browse source
This commit is contained in:
xiaoyifang 2024-11-22 11:35:22 +08:00
parent 482e696847
commit 8d4eeb581f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/utils.cc
View file

@ -50,9 +50,10 @@ QString unescapeAmps( QString const & str )
QTextCodec::Encoding detectCodec( QByteArray & ba, char16_t expectedFirstCharacter = 0 ) QTextCodec::Encoding detectCodec( QByteArray & ba, char16_t expectedFirstCharacter = 0 )
{ {
QStringConverter::Encoding detectedEncoding = QStringConverter::encodingForData( data, expectedFirstCharacter ); QStringConverter::Encoding detectedEncoding = detectEncoding( ba, expectedFirstCharacter );
// mapping the encoding // mapping the encoding
if ( detectedEncoding.has_value() && encodingMap.contains( detectedEncoding.value() ) ) { if (encodingMap.contains( detectedEncoding ) )
{
return encodingMap[ encoding ]; return encodingMap[ encoding ];
} }
// default utf8 // default utf8
@ -62,7 +63,6 @@ QTextCodec::Encoding detectCodec( QByteArray & ba, char16_t expectedFirstCharact
QStringConverter::Encoding detectEncoding( QByteArray & ba, char16_t expectedFirstCharacter = 0 ) QStringConverter::Encoding detectEncoding( QByteArray & ba, char16_t expectedFirstCharacter = 0 )
{ {
QStringConverter::Encoding detectedEncoding = QStringConverter::encodingForData( data, expectedFirstCharacter ); QStringConverter::Encoding detectedEncoding = QStringConverter::encodingForData( data, expectedFirstCharacter );
// mapping the encoding
if ( detectedEncoding.has_value() ) { if ( detectedEncoding.has_value() ) {
return detectedEncoding.value(); return detectedEncoding.value();
} }