diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-22 10:18:13 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-22 10:20:00 (GMT) |
| commit | f56ef9b4f7b4509cf14d1f38086f6801cd1b9df4 (patch) | |
| tree | 685cf815d803a35e480a3e07addfdf36bffc68db /src/3rdparty/harfbuzz | |
| parent | caa6665a17ea7670ebd86a1775705718e01edbd7 (diff) | |
| download | Qt-f56ef9b4f7b4509cf14d1f38086f6801cd1b9df4.zip Qt-f56ef9b4f7b4509cf14d1f38086f6801cd1b9df4.tar.gz Qt-f56ef9b4f7b4509cf14d1f38086f6801cd1b9df4.tar.bz2 | |
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
* Import f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 which fixes a crash
with certain fonts.
Diffstat (limited to 'src/3rdparty/harfbuzz')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-open.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open.c b/src/3rdparty/harfbuzz/src/harfbuzz-open.c index 15cd2c1..f12f5b7 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-open.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-open.c @@ -1403,12 +1403,11 @@ _HB_OPEN_Get_Device( HB_Device* d, HB_UShort size, HB_Short* value ) { - HB_UShort byte, bits, mask, f, s; + HB_UShort byte, bits, mask, s; - f = d->DeltaFormat; - - if ( d->DeltaValue && size >= d->StartSize && size <= d->EndSize ) + if ( d && d->DeltaValue && size >= d->StartSize && size <= d->EndSize ) { + HB_UShort f = d->DeltaFormat; s = size - d->StartSize; byte = d->DeltaValue[s >> ( 4 - f )]; bits = byte >> ( 16 - ( ( s % ( 1 << ( 4 - f ) ) + 1 ) << f ) ); |