diff options
| -rw-r--r-- | src/gui/embedded/qscreenlinuxfb_qws.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_qws.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp index 3fe9713335..6d16af85b0 100644 --- a/src/gui/embedded/qscreenlinuxfb_qws.cpp +++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp @@ -383,9 +383,9 @@ bool QLinuxFbScreen::connect(const QString &displaySpec) dh=h; int xxoff, yyoff; if (sscanf(qwssize, "%*dx%*d+%d+%d", &xxoff, &yyoff) == 2) { - if (xxoff < 0 || xxoff + w > vinfo.xres) + if (xxoff < 0 || xxoff + w > (int)vinfo.xres) xxoff = vinfo.xres - w; - if (yyoff < 0 || yyoff + h > vinfo.yres) + if (yyoff < 0 || yyoff + h > (int)vinfo.yres) yyoff = vinfo.yres - h; xoff += xxoff; yoff += yyoff; diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp index 5ce4048f7c..1215b1fce4 100644 --- a/src/gui/text/qfontengine_qws.cpp +++ b/src/gui/text/qfontengine_qws.cpp @@ -331,7 +331,7 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn) d->used_mmap = false; #endif d->mmapStart = new uchar[d->mmapLength]; - if (QT_READ(fd, d->mmapStart, d->mmapLength) != d->mmapLength) + if (QT_READ(fd, d->mmapStart, d->mmapLength) != (qint64)d->mmapLength) qFatal("Failed to read '%s'", QFile::encodeName(fn).constData()); } QT_CLOSE(fd); |