diff options
| author | Leonard Lee <leonard.lee@digia.com> | 2013-02-04 15:03:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-05 17:28:02 +0100 |
| commit | 44ea4280b20179eea5520fd1ef5ac814c528c45e (patch) | |
| tree | 0850d8a641692f9b89308b98bdf7aca7d166770f | |
| parent | 4b0831581a87db4eb4281d44990ae09f2454f01d (diff) | |
Fix TIFFTAG_RESOLUTIONUNIT handling.
If there is no TIFFTAG_RESOLUTIONUNIT record, the value of resUnit
should be RESUNIT_INCH and not RESUNIT_NONE.
Task-number: QTBUG-22322
Change-Id: Idb1ffeec85fdb5a23d93fa53505440a9e2f8914e
Reviewed-by: aavit <eirik.aavitsland@digia.com>
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index b2921c0..ef76a6d 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -289,9 +289,11 @@ bool QTiffHandler::read(QImage *image) float resX = 0; float resY = 0; - uint16 resUnit = RESUNIT_NONE; - if (TIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &resUnit) - && TIFFGetField(tiff, TIFFTAG_XRESOLUTION, &resX) + uint16 resUnit; + if (!TIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &resUnit)) + resUnit = RESUNIT_INCH; + + if (TIFFGetField(tiff, TIFFTAG_XRESOLUTION, &resX) && TIFFGetField(tiff, TIFFTAG_YRESOLUTION, &resY)) { switch(resUnit) { |