diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-04-29 15:55:11 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2021-05-03 13:04:47 +0000 |
| commit | 16a1ba69a682fbe7855682448ac0340574a67035 (patch) | |
| tree | 87b1d7191392d70ff130c9410b3dc64e4394faf9 /src | |
| parent | b5ceba01288acee2b658ea6599abd2e55d389aa4 (diff) | |
Disable spurious MSVC warning C4273 in Qt Gui, Qt OpenGL
For optimized/release builds, cl 19.28 produces some false positive
"potential divide by 0" warnings even for code where no valid code path
can lead to such a division.
Fixes: QTBUG-92940
Pick-to: 6.1
Change-Id: I461f9104d7b9dc2d74839bf30bebb2b9d4cf2db3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qimage.cpp | 5 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 5 | ||||
| -rw-r--r-- | src/opengl/qopenglpaintengine.cpp | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 8011aa2eb5..95be9772c8 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -77,6 +77,11 @@ QT_BEGIN_NAMESPACE +// MSVC 19.28 does show spurious warning "C4723: potential divide by 0" for code that divides +// by height() in release builds. Anyhow, all the code paths in this file are only executed +// for valid QImage's, where height() cannot be 0. Therefore disable the warning. +QT_WARNING_DISABLE_MSVC(4723) + static inline bool isLocked(QImageData *data) { return data != nullptr && data->is_locked; diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index a57e4c1fe2..3d46dc4a6b 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -70,6 +70,11 @@ QT_BEGIN_NAMESPACE +// MSVC 19.28 does show spurious warning "C4723: potential divide by 0" for code that divides +// by height() in release builds. Anyhow, all the code paths in this file are only executed +// for valid QPixmap's, where height() cannot be 0. Therefore disable the warning. +QT_WARNING_DISABLE_MSVC(4723) + static bool qt_pixmap_thread_test() { if (Q_UNLIKELY(!QCoreApplication::instance())) { diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp index 9c8325ca11..7da9bf143d 100644 --- a/src/opengl/qopenglpaintengine.cpp +++ b/src/opengl/qopenglpaintengine.cpp @@ -1745,6 +1745,14 @@ bool QOpenGL2PaintEngineEx::shouldDrawCachedGlyphs(QFontEngine *fontEngine, cons return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t); } + +// MSVC 19.28 does show spurious warning "C4723: potential divide by 0" for the code +// that divides by QOpenGLTextureGlyphCache::height() in release builds. +// Anyhow, the code path in this method is only executed +// if height() != 0. Therefore disable the warning. +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4723) + void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat, QStaticTextItem *staticTextItem) { @@ -2060,6 +2068,8 @@ void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat gly #endif } +QT_WARNING_POP + void QOpenGL2PaintEngineEx::drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, QPainter::PixmapFragmentHints hints) { |