diff options
| author | YAMAMOTO Mitsuharu | 2019-06-30 16:09:56 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-06-30 16:09:56 +0900 |
| commit | 36a8024e2b2e5e8714f8e636657c898a4bffaafb (patch) | |
| tree | 911a72d94956f7ff3d23f3bc083277a4d35bd5f7 /src | |
| parent | e2d8c1e8bcfaa107be653758ed6088fcb593d5ac (diff) | |
| download | emacs-36a8024e2b2e5e8714f8e636657c898a4bffaafb.tar.gz emacs-36a8024e2b2e5e8714f8e636657c898a4bffaafb.zip | |
Fix negation in elements of OTF feature list
* src/ftfont.c (ftfont_get_open_type_spec):
* src/macfont.m (macfont_get_open_type_spec): Take bitwise or instead of and.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 2 | ||||
| -rw-r--r-- | src/macfont.m | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 4380a48d8dc..384279f616b 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -613,7 +613,7 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec) | |||
| 613 | unsigned int tag; | 613 | unsigned int tag; |
| 614 | 614 | ||
| 615 | OTF_SYM_TAG (XCAR (val), tag); | 615 | OTF_SYM_TAG (XCAR (val), tag); |
| 616 | spec->features[i][j++] = negative ? tag & 0x80000000 : tag; | 616 | spec->features[i][j++] = negative ? tag | 0x80000000 : tag; |
| 617 | } | 617 | } |
| 618 | } | 618 | } |
| 619 | spec->nfeatures[i] = j; | 619 | spec->nfeatures[i] = j; |
diff --git a/src/macfont.m b/src/macfont.m index abdf0ecfe59..f736fbf0e1e 100644 --- a/src/macfont.m +++ b/src/macfont.m | |||
| @@ -1824,7 +1824,7 @@ macfont_get_open_type_spec (Lisp_Object otf_spec) | |||
| 1824 | unsigned int tag; | 1824 | unsigned int tag; |
| 1825 | 1825 | ||
| 1826 | OTF_SYM_TAG (XCAR (val), tag); | 1826 | OTF_SYM_TAG (XCAR (val), tag); |
| 1827 | spec->features[i][j++] = negative ? tag & 0x80000000 : tag; | 1827 | spec->features[i][j++] = negative ? tag | 0x80000000 : tag; |
| 1828 | } | 1828 | } |
| 1829 | } | 1829 | } |
| 1830 | spec->nfeatures[i] = j; | 1830 | spec->nfeatures[i] = j; |