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:18:13 (GMT) |
| commit | b4dd04f50b2e275ef9f8e643f33143d20a436203 (patch) | |
| tree | 979a8c4bcd2900e057e23cce470f9d1d403c6119 /src/3rdparty/harfbuzz | |
| parent | bae2219587a8c1a4c922d1cde51616e3ea1df370 (diff) | |
| download | Qt-b4dd04f50b2e275ef9f8e643f33143d20a436203.zip Qt-b4dd04f50b2e275ef9f8e643f33143d20a436203.tar.gz Qt-b4dd04f50b2e275ef9f8e643f33143d20a436203.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 ) ); |