diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-02-09 11:02:09 -0800 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-02-09 11:02:09 -0800 |
| commit | e8c9796279273597ceacba17d7bf5bcdbcecaee1 (patch) | |
| tree | b00f6c2a307e4179c3ba19e6685c02cbb9ccf701 | |
| parent | d3671e03f6c96f8498ddccd3b175005537302bb5 (diff) | |
| download | harfbuzz-e8c9796279273597ceacba17d7bf5bcdbcecaee1.tar.gz | |
Update Harfbuzz from upstream
- Don't force using packed structs:
http://cgit.freedesktop.org/harfbuzz.old/commit/?id=624feeed252024dcc076903e26f6b625f2c93c7f
- Fix RTL GPOS issue
http://cgit.freedesktop.org/harfbuzz.old/commit/?id=4717a185539d678b2040820e05bfe065d5d7c16d
Change-Id: I2461d9916855e09135517d3ca6138865c2d655a9
| -rwxr-xr-x | src/harfbuzz-global.h | 4 | ||||
| -rwxr-xr-x | src/harfbuzz-shaper.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/harfbuzz-global.h b/src/harfbuzz-global.h index bccd6a2..d4e6b46 100755 --- a/src/harfbuzz-global.h +++ b/src/harfbuzz-global.h @@ -39,10 +39,6 @@ #define HB_END_HEADER /* nothing */ #endif -#if defined(__GNUC__) || defined(_MSC_VER) -#define HB_USE_PACKED_STRUCTS -#endif - HB_BEGIN_HEADER #ifndef FALSE diff --git a/src/harfbuzz-shaper.cpp b/src/harfbuzz-shaper.cpp index 5a66d13..65da6c7 100755 --- a/src/harfbuzz-shaper.cpp +++ b/src/harfbuzz-shaper.cpp @@ -1276,7 +1276,7 @@ HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool do // (int)(positions[i].x_pos >> 6), (int)(positions[i].y_pos >> 6), // positions[i].back, positions[i].new_advance); - HB_Fixed adjustment = (item->item.bidiLevel % 2) ? -positions[i].x_advance : positions[i].x_advance; + HB_Fixed adjustment = positions[i].x_advance; if (!(face->current_flags & HB_ShaperFlag_UseDesignMetrics)) adjustment = HB_FIXED_ROUND(adjustment); |