diff options
| author | Mike FABIAN <mfabian@redhat.com> | 2022-12-05 11:07:59 +0100 |
|---|---|---|
| committer | Mike FABIAN <mfabian@redhat.com> | 2022-12-09 09:23:19 +0100 |
| commit | ce9cbe36d81efaafb9e60b6899665b370e872e81 (patch) | |
| tree | 9cad7ca1536e653266c1dd4a54d2ac43b5063872 | |
| parent | 9097ada0ef262e83b9507eebf731e6e47eb9ec96 (diff) | |
| download | fontconfig-ce9cbe36d81efaafb9e60b6899665b370e872e81.tar.gz | |
Change index type to 16 bit and bump cache version to 9
The number of .orth files is now > 256, therefore the index type needs to be 16 bit.
| -rwxr-xr-x | fc-lang/fc-lang.py | 4 | ||||
| -rw-r--r-- | fontconfig/fontconfig.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fc-lang/fc-lang.py b/fc-lang/fc-lang.py index cc1dea8..8facea6 100755 --- a/fc-lang/fc-lang.py +++ b/fc-lang/fc-lang.py @@ -251,7 +251,7 @@ if __name__=='__main__': print('#define fcLangCharSetIndices (fcLangData.langIndices)') print('#define fcLangCharSetIndicesInv (fcLangData.langIndicesInv)') - assert len(sets) < 256 # FIXME: need to change index type to 16-bit below then + assert len(sets) < 65536 # FIXME: need to change index type to 32-bit below then print(''' static const struct {{ @@ -262,7 +262,7 @@ static const struct {{ {} langIndices[{}]; {} langIndicesInv[{}]; }} fcLangData = {{'''.format(len(sets), len(leaves), tn, tn, - 'FcChar8 ', len(sets), 'FcChar8 ', len(sets))) + 'FcChar16 ', len(sets), 'FcChar16 ', len(sets))) # Dump sets print('{') diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h index ac5a0b0..15c1b95 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -67,7 +67,7 @@ typedef int FcBool; * it means multiple copies of the font information. */ -#define FC_CACHE_VERSION_NUMBER 8 +#define FC_CACHE_VERSION_NUMBER 9 #define _FC_STRINGIFY_(s) #s #define _FC_STRINGIFY(s) _FC_STRINGIFY_(s) #define FC_CACHE_VERSION _FC_STRINGIFY(FC_CACHE_VERSION_NUMBER) |