mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-14 11:04:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix trying to scale images on null images

Browse Source
This commit is contained in:
Luis Ángel San Martín
2020-09-03 18:00:29 +02:00
parent 4234dedece
commit 802e0d32ce
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/gl/yacreader_flow_gl.cpp
View File

@ -1388,7 +1388,10 @@ void YACReaderPageFlowGL::populate(int n)
QImage ImageLoaderGL::loadImage(const QString &fileName) QImage ImageLoaderGL::loadImage(const QString &fileName)
{ {
QImage image; QImage image;
bool result = image.load(fileName);
if (!image.load(fileName)) {
return QImage();
}
switch (flow->performance) { switch (flow->performance) {
case low: case low:
@ -1404,9 +1407,6 @@ QImage ImageLoaderGL::loadImage(const QString &fileName)
break; //no scaling in ultraHigh break; //no scaling in ultraHigh
} }
if (!result)
return QImage();
return image; return image;
} }
@ -1493,7 +1493,10 @@ QImage ImageLoaderGL::result()
QImage ImageLoaderByteArrayGL::loadImage(const QByteArray &raw) QImage ImageLoaderByteArrayGL::loadImage(const QByteArray &raw)
{ {
QImage image; QImage image;
bool result = image.loadFromData(raw);
if (!image.loadFromData(raw)) {
return QImage();
}
switch (flow->performance) { switch (flow->performance) {
case low: case low:
@ -1510,9 +1513,6 @@ QImage ImageLoaderByteArrayGL::loadImage(const QByteArray &raw)
break; break;
} }
if (!result)
return QImage();
return image; return image;
} }