osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

QCustomPlot: Fix clang warning on Qt5 

Fix a shortening warning from qint64 to int on Qt5.
This commit is contained in:
John Thacker 2022-11-18 08:30:36 -05:00
parent 117fa55c04
commit b262dd3d29
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/qt/widgets/qcustomplot.cpp
View File

@ -16732,7 +16732,11 @@ void QCPColorGradient::colorize(const double *data, const QCPRange &range, QRgb
if (index < 0)
index += mLevelCount;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
scanLine[i] = mColorBuffer.at(static_cast<int>(index));
#else
scanLine[i] = mColorBuffer.at(index);
#endif
} else
{
switch(mNanHandling)
@ -16795,10 +16799,18 @@ void QCPColorGradient::colorize(const double *data, const unsigned char *alpha,
}
if (alpha[dataIndexFactor*i] == 255)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
scanLine[i] = mColorBuffer.at(static_cast<int>(index));
#else
scanLine[i] = mColorBuffer.at(index);
#endif
} else
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
const QRgb rgb = mColorBuffer.at(static_cast<int>(index));
#else
const QRgb rgb = mColorBuffer.at(index);
#endif
const float alphaF = alpha[dataIndexFactor*i]/255.0f;
scanLine[i] = qRgba(int(qRed(rgb)*alphaF), int(qGreen(rgb)*alphaF), int(qBlue(rgb)*alphaF), int(qAlpha(rgb)*alphaF)); // also multiply r,g,b with alpha, to conform to Format_ARGB32_Premultiplied
}