flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid scaling for null pixmaps (results in warnings)

Browse Source
This commit is contained in:
Klaus Basan
2016-05-29 12:22:32 +02:00
parent bc926e592e
commit 771c531125
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/mappingcomponent.cpp
View File

@@ -211,7 +211,7 @@ namespace BlackGui
else
{
QPixmap qpm = pm.pixmap();
if (qpm.height() > MaxHeight)
if (qpm.height() > MaxHeight && !qpm.isNull())
{
qpm = qpm.scaledToWidth(MaxHeight, Qt::SmoothTransformation);
}

14
src/blackgui/overlaymessages.cpp
View File

@@ -167,9 +167,17 @@ namespace BlackGui
}
this->ui->lbl_Image->setText("");
this->ui->lbl_Image->setPixmap(
image.scaled(sizeAvailable, Qt::KeepAspectRatio, Qt::FastTransformation)
);
if (image.isNull())
{
static const QPixmap e;
this->ui->lbl_Image->setPixmap(e);
}
else
{
this->ui->lbl_Image->setPixmap(
image.scaled(sizeAvailable, Qt::KeepAspectRatio, Qt::FastTransformation)
);
}
this->display(timeOutMs);
}