diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-12-29 10:04:58 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-07 10:43:47 (GMT) |
| commit | 996275507137564eb7e20271b6fc008052f87932 (patch) | |
| tree | fb799d96f5be735066261f2aa5dc05861742cd73 | |
| parent | 6c6df995cc9462695bf29f236fd05ddfdc2aba48 (diff) | |
| download | Qt-996275507137564eb7e20271b6fc008052f87932.zip Qt-996275507137564eb7e20271b6fc008052f87932.tar.gz Qt-996275507137564eb7e20271b6fc008052f87932.tar.bz2 | |
Fixed a copy-paste error in QRasterPixmapData::metric().
Calling metric() to get the device height in mm of a pixmap when using
the raster engine would actually return the width..
Task-number: QTBUG-6985
Reviewed-by: Carlos Duclos
(cherry picked from commit 4bd7e6930fcd9e04696aa5426691cd90ba383a32)
| -rw-r--r-- | src/gui/image/qpixmap_raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 0ba731f..2129c3b 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -375,7 +375,7 @@ int QRasterPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const case QPaintDevice::PdmWidthMM: return qRound(d->width * 25.4 / qt_defaultDpiX()); case QPaintDevice::PdmHeightMM: - return qRound(d->width * 25.4 / qt_defaultDpiY()); + return qRound(d->height * 25.4 / qt_defaultDpiY()); case QPaintDevice::PdmNumColors: return d->colortable.size(); case QPaintDevice::PdmDepth: |