diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-31 09:21:40 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-31 09:21:40 (GMT) |
| commit | d43455eaa9106c63885fe04c39a7b2c7249f406f (patch) | |
| tree | 1fc9d1355ac9654253503dd53f8c2dd9a5917e94 /src/3rdparty | |
| parent | 2e90e8dda26721dcab4842f9ac3eeadecfadd80f (diff) | |
| parent | 7b18baf23b1e8c663872b2b25b1323798b1d09df (diff) | |
| download | Qt-d43455eaa9106c63885fe04c39a7b2c7249f406f.zip Qt-d43455eaa9106c63885fe04c39a7b2c7249f406f.tar.gz Qt-d43455eaa9106c63885fe04c39a7b2c7249f406f.tar.bz2 | |
Merge remote branch 'origin/master' into 4.8-earth
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp index 6c4d9f1..c202e1f 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -1052,16 +1052,16 @@ HB_Bool HB_SelectScript(HB_ShaperItem *shaper_item, const HB_OpenTypeFeature *fe { HB_Script script = shaper_item->item.script; - if (!shaper_item->face->supported_scripts[script]) - return false; - HB_Face face = shaper_item->face; if (face->current_script == script && face->current_flags == shaper_item->shaperFlags) - return true; + return shaper_item->face->supported_scripts[script] ? true : false; face->current_script = script; face->current_flags = shaper_item->shaperFlags; + if (!shaper_item->face->supported_scripts[script]) + return false; + assert(script < HB_ScriptCount); // find script in our list of supported scripts. unsigned int tag = ot_scripts[script].tag; |