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

Merge pull request #878 from shenlebantongying/staged

Browse source 
guard against null img for ZIM
This commit is contained in:
xiaoyifang 2023-06-19 17:47:47 +08:00 committed by GitHub
parent 1a0a9ca097 a76ef3dfdd
commit 1185e8896f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/dict/zim.cc
View file

@ -290,7 +290,14 @@ void ZimDictionary::loadIcon() noexcept
try { try {
auto illustration = df.getIllustrationItem( 48 ).getData(); auto illustration = df.getIllustrationItem( 48 ).getData();
QImage img = QImage::fromData( reinterpret_cast< const uchar * >( illustration.data() ), illustration.size() ); QImage img = QImage::fromData( reinterpret_cast< const uchar * >( illustration.data() ), illustration.size() );
dictionaryIcon = QIcon( QPixmap::fromImage( img ) );
if ( img.isNull() ) {
// Fallback to default icon
dictionaryIcon = QIcon( ":/icons/icon32_zim.png" );
}
else {
dictionaryIcon = QIcon( QPixmap::fromImage( img ) );
}
dictionaryIconLoaded = true; dictionaryIconLoaded = true;
return; return;
@ -298,11 +305,6 @@ void ZimDictionary::loadIcon() noexcept
catch ( zim::EntryNotFound & e ) { catch ( zim::EntryNotFound & e ) {
gdDebug( "ZIM icon not loaded for: %s", dictionaryName.c_str() ); gdDebug( "ZIM icon not loaded for: %s", dictionaryName.c_str() );
} }
// Fallback to default icon
dictionaryIcon = QIcon( ":/icons/icon32_zim.png" );
dictionaryIconLoaded = true;
} }
quint32 ZimDictionary::loadArticle( quint32 address, string & articleText, bool rawText ) quint32 ZimDictionary::loadArticle( quint32 address, string & articleText, bool rawText )