diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-21 11:14:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-21 11:14:34 +0100 |
| commit | 112342b32650f56e289c7dcd181d5897b0b77a78 (patch) | |
| tree | 76e9a37bcaa70097d009628bb2b116ea782c72cb /src/gui/image/qjpeghandler.cpp | |
| parent | 3bbc1bf53bac7648637d92abecadc568acfffb2d (diff) | |
| parent | b6191b16d41459ed73cea738dfaf8e25e81ae22b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/image/qjpeghandler.cpp')
| -rw-r--r-- | src/gui/image/qjpeghandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index eb580c81f1..b07e1e28d3 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -825,10 +825,10 @@ static int getExifOrientation(QByteArray &exifData) quint16 tag; quint16 type; quint32 components; - quint32 value; - - stream >> tag >> type >> components >> value; + quint16 value; + quint16 dummy; + stream >> tag >> type >> components >> value >> dummy; if (tag == 0x0112) { // Tag Exif.Image.Orientation if (components !=1) return -1; |