diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-09-27 15:50:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-09-27 15:50:44 (GMT) |
| commit | ac13d6e5ff47f8b9820206e141bce1a24db24c70 (patch) | |
| tree | 86af9ee2224609b4e01f671a9c028ffb75cbc036 | |
| parent | e4b426266092d66106abb23a71b5064c9f6bf776 (diff) | |
| parent | 38ad1c5f53895565f2b34e77210278eebeb03519 (diff) | |
| download | tk-ac13d6e5ff47f8b9820206e141bce1a24db24c70.zip tk-ac13d6e5ff47f8b9820206e141bce1a24db24c70.tar.gz tk-ac13d6e5ff47f8b9820206e141bce1a24db24c70.tar.bz2 | |
merge core-8-6-branch, keep FONTMAP_SHIFT to the original value.
FossilOrigin-Name: 7d11da38b1366d28a127f4e26efc9875ca132001
| -rw-r--r-- | win/tkWinFont.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 7c6c0ba..43c4834 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -26,8 +26,9 @@ * Under Windows, a "font family" is uniquely identified by its face name. */ -#define FONTMAP_SHIFT 12 -#define FONTMAP_PAGES (1 << (21 - FONTMAP_SHIFT)) +#define FONTMAP_SHIFT 10 + +#define FONTMAP_PAGES (1 << (sizeof(Tcl_UniChar)*8 - FONTMAP_SHIFT)) #define FONTMAP_BITSPERPAGE (1 << FONTMAP_SHIFT) typedef struct FontFamily { |