diff options
| author | K. Handa | 2015-09-02 18:27:23 +0900 |
|---|---|---|
| committer | K. Handa | 2015-09-02 18:27:23 +0900 |
| commit | ae08d073d7e2738580341534adc3c5924dc76860 (patch) | |
| tree | 0fd19bb4e7dbd6cf3690e592939088d8e73213ad /src | |
| parent | 3e0e2339cd379eeba8d9bc758f2e8e574144e252 (diff) | |
| download | emacs-ae08d073d7e2738580341534adc3c5924dc76860.tar.gz emacs-ae08d073d7e2738580341534adc3c5924dc76860.zip | |
fix previous change
* ftfont.c (ftfont_drive_otf): Remember some bits of
OTF_Glyph->positioning_type in MFLTGlyphFT->libotf_positioning_type.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 885fee61ba1..a110cd8a8d8 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -1934,6 +1934,10 @@ ftfont_drive_otf (MFLTFont *font, | |||
| 1934 | tag = PACK_OTF_TAG (tag); | 1934 | tag = PACK_OTF_TAG (tag); |
| 1935 | g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; | 1935 | g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; |
| 1936 | } | 1936 | } |
| 1937 | #ifdef OTF_POSITIONING_TYPE_GET_FORMAT | ||
| 1938 | g->libotf_positioning_type | ||
| 1939 | = otfg->positioning_type & otf_positioning_type_components_mask; | ||
| 1940 | #endif | ||
| 1937 | for (i++, otfg++; (i < otf_gstring.used | 1941 | for (i++, otfg++; (i < otf_gstring.used |
| 1938 | && otfg->f.index.from == otfg[-1].f.index.from); | 1942 | && otfg->f.index.from == otfg[-1].f.index.from); |
| 1939 | i++, otfg++) | 1943 | i++, otfg++) |
| @@ -1957,6 +1961,10 @@ ftfont_drive_otf (MFLTFont *font, | |||
| 1957 | tag = PACK_OTF_TAG (tag); | 1961 | tag = PACK_OTF_TAG (tag); |
| 1958 | g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; | 1962 | g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; |
| 1959 | } | 1963 | } |
| 1964 | #ifdef OTF_POSITIONING_TYPE_GET_FORMAT | ||
| 1965 | g->libotf_positioning_type | ||
| 1966 | = otfg->positioning_type & otf_positioning_type_components_mask; | ||
| 1967 | #endif | ||
| 1960 | out->used++; | 1968 | out->used++; |
| 1961 | } | 1969 | } |
| 1962 | } | 1970 | } |