diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2010-09-07 12:07:34 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-09-14 15:04:12 +0200 |
| commit | cb6380beb81ab9571c547270c144988781fed465 (patch) | |
| tree | 88d2feb9528b3cb3ac5da8cd13b792f8bf77001b /src/gui/text/qfontengine_mac.mm | |
| parent | 84066a357e868b7d3f774f4847840014d3bf9e51 (diff) | |
fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale images
This commit fixes reading a .tiff file from ImageMagick which reports
the following:
TIFFTAG_BITSPERSAMPLE = 8
TIFFTAG_SAMPLESPERPIXEL = 2
TIFFTAG_PHOTOMETRIC = PHOTOMETRIC_MINISBLACK
The reader uses QImage::Format_Indexed8, but since the samples per pixel
value this should be (non-existent) QImage::Format_Indexed16, causing
memory corruption. The fix falls back to the "normal" way of reading
tiff images.
Merge-request: 2467
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
0 files changed, 0 insertions, 0 deletions