diff options
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimageiohandler.h | 2 | ||||
| -rw-r--r-- | src/gui/image/qppmhandler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 35984dd6a5..990df96534 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -141,7 +141,7 @@ class Q_GUI_EXPORT QImageIOPlugin : public QObject Q_OBJECT public: explicit QImageIOPlugin(QObject *parent = nullptr); - virtual ~QImageIOPlugin(); + ~QImageIOPlugin(); enum Capability { CanRead = 0x1, diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp index 53e3fa293d..1863c58ff0 100644 --- a/src/gui/image/qppmhandler.cpp +++ b/src/gui/image/qppmhandler.cpp @@ -123,7 +123,7 @@ static bool read_pbm_header(QIODevice *device, char& type, int& w, int& h, int& static inline QRgb scale_pbm_color(quint16 mx, quint16 rv, quint16 gv, quint16 bv) { - return QRgba64::fromRgba64((rv * 0xffff) / mx, (gv * 0xffff) / mx, (bv * 0xffff) / mx, 0xffff).toArgb32(); + return QRgba64::fromRgba64((rv * 0xffffu) / mx, (gv * 0xffffu) / mx, (bv * 0xffffu) / mx, 0xffff).toArgb32(); } static bool read_pbm_body(QIODevice *device, char type, int w, int h, int mcc, QImage *outImage) |