diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-20 11:01:24 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-20 11:01:24 (GMT) |
| commit | b7b20e33f36fd942811af33eae906ccdcf486112 (patch) | |
| tree | b79f93c0cb2ef72056a378aec0d28a770ae07b8a /src/3rdparty/harfbuzz | |
| parent | e35c073c72bb297b4760ee4041ce487c08723d14 (diff) | |
| parent | b8205bd9dc0288f66f1c23e9f227e703bc6712bd (diff) | |
| download | Qt-b7b20e33f36fd942811af33eae906ccdcf486112.zip Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.gz Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'src/3rdparty/harfbuzz')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-gpos.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c index a216005..7bd3b3b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c @@ -3012,6 +3012,9 @@ static HB_Error Lookup_MarkMarkPos( GPOS_Instance* gpi, j--; } + if ( i > buffer->in_pos ) + return HB_Err_Not_Covered; + error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ), &mark2_index ); if ( error ) |