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

Merge pull request #337 from xiaoyifang/fix/iconv-convert-error

Browse source 
fix: iconv convert error
This commit is contained in:
xiaoyifang 2023-02-08 10:38:07 +08:00 committed by GitHub
parent 105019da95 5eac90e72c
commit ca5b47cca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iconv.cc
View file

@ -16,7 +16,8 @@ using gd::wchar;
Iconv::Iconv( char const * to, char const * from )
#ifdef USE_ICONV
:state( iconv_open( to, from ) )
// the to encoding must be UTF8
:state( iconv_open( Utf8, from ) )
#endif
{
#ifdef USE_ICONV
@ -96,8 +97,8 @@ QString Iconv::convert(void const* & inBuf, size_t& inBytesLeft)
}
size_t datasize = outBuf.size() - outBufLeft;
QByteArray ba( &outBuf.front(), datasize );
return QString( ba );
// QByteArray ba( &outBuf.front(), datasize );
return QString::fromUtf8( &outBuf.front(), datasize );
#else
if( codec )
return codec->toUnicode( static_cast< const char * >( inBuf ), inBytesLeft );
@ -116,7 +117,7 @@ gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData,
if ( !dataSize )
return gd::wstring();
Iconv ic( GdWchar, fromEncoding );
Iconv ic( Utf8, fromEncoding );
QString outStr = ic.convert(fromData, dataSize);
return gd::toWString(outStr);