walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ucdn] Make data tables const!

This commit is contained in:
Behdad Esfahbod 2012-11-22 16:26:22 -05:00
parent 7c5b7fe686
commit 5be86b1bb4
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hb-ucdn/ucdn.c
View File

@ -51,7 +51,7 @@ typedef struct {
#define TCOUNT 28 #define TCOUNT 28
#define NCOUNT (VCOUNT * TCOUNT) #define NCOUNT (VCOUNT * TCOUNT)
static UCDRecord *get_ucd_record(uint32_t code) static const UCDRecord *get_ucd_record(uint32_t code)
{ {
int index, offset; int index, offset;
@ -68,7 +68,7 @@ static UCDRecord *get_ucd_record(uint32_t code)
return &ucd_records[index]; return &ucd_records[index];
} }
static unsigned short *get_decomp_record(uint32_t code) static const unsigned short *get_decomp_record(uint32_t code)
{ {
int index, offset; int index, offset;
@ -86,12 +86,12 @@ static unsigned short *get_decomp_record(uint32_t code)
return &decomp_data[index]; return &decomp_data[index];
} }
static int get_comp_index(uint32_t code, Reindex *idx) static const int get_comp_index(uint32_t code, const Reindex *idx)
{ {
int i; int i;
for (i = 0; idx[i].start; i++) { for (i = 0; idx[i].start; i++) {
Reindex *cur = &idx[i]; const Reindex *cur = &idx[i];
if (code < cur->start) if (code < cur->start)
return -1; return -1;
if (code <= cur->start + cur->count) { if (code <= cur->start + cur->count) {
@ -151,9 +151,9 @@ static int hangul_pair_compose(uint32_t *code, uint32_t a, uint32_t b)
} }
} }
static uint32_t decode_utf16(unsigned short **code_ptr) static uint32_t decode_utf16(const unsigned short **code_ptr)
{ {
unsigned short *code = *code_ptr; const unsigned short *code = *code_ptr;
if ((code[0] & 0xd800) != 0xd800) { if ((code[0] & 0xd800) != 0xd800) {
*code_ptr += 1; *code_ptr += 1;
@ -220,7 +220,7 @@ uint32_t ucdn_mirror(uint32_t code)
int ucdn_decompose(uint32_t code, uint32_t *a, uint32_t *b) int ucdn_decompose(uint32_t code, uint32_t *a, uint32_t *b)
{ {
unsigned short *rec; const unsigned short *rec;
int len; int len;
if (hangul_pair_decompose(code, a, b)) if (hangul_pair_decompose(code, a, b))
@ -268,7 +268,7 @@ int ucdn_compose(uint32_t *code, uint32_t a, uint32_t b)
int ucdn_compat_decompose(uint32_t code, uint32_t *decomposed) int ucdn_compat_decompose(uint32_t code, uint32_t *decomposed)
{ {
int i, len; int i, len;
unsigned short *rec = get_decomp_record(code); const unsigned short *rec = get_decomp_record(code);
len = rec[0] >> 8; len = rec[0] >> 8;
if (len == 0) if (len == 0)

28
src/hb-ucdn/unicodedata_db.h
View File

@ -2,7 +2,7 @@
#define UNIDATA_VERSION "6.2.0" #define UNIDATA_VERSION "6.2.0"
/* a list of unique database records */ /* a list of unique database records */
static UCDRecord ucd_records[] = { static const UCDRecord ucd_records[] = {
{2, 0, 18, 0, 5, 0, 102}, {2, 0, 18, 0, 5, 0, 102},
{0, 0, 14, 0, 5, 0, 0}, {0, 0, 14, 0, 5, 0, 0},
{0, 0, 16, 0, 5, 0, 0}, {0, 0, 16, 0, 5, 0, 0},
@ -704,7 +704,7 @@ static UCDRecord ucd_records[] = {
}; };
#define BIDI_MIRROR_LEN 364 #define BIDI_MIRROR_LEN 364
static MirrorPair mirror_pairs[] = { static const MirrorPair mirror_pairs[] = {
{40, 41}, {40, 41},
{41, 40}, {41, 40},
{60, 62}, {60, 62},
@ -1074,7 +1074,7 @@ static MirrorPair mirror_pairs[] = {
/* Reindexing of NFC first characters. */ /* Reindexing of NFC first characters. */
#define TOTAL_FIRST 372 #define TOTAL_FIRST 372
#define TOTAL_LAST 56 #define TOTAL_LAST 56
static Reindex nfc_first[] = { static const Reindex nfc_first[] = {
{ 60, 2, 0}, { 60, 2, 0},
{ 65, 15, 3}, { 65, 15, 3},
{ 82, 8, 19}, { 82, 8, 19},
@ -1285,7 +1285,7 @@ static Reindex nfc_first[] = {
{0,0,0} {0,0,0}
}; };
static Reindex nfc_last[] = { static const Reindex nfc_last[] = {
{ 768, 4, 0}, { 768, 4, 0},
{ 774, 6, 5}, { 774, 6, 5},
{ 783, 0, 12}, { 783, 0, 12},
@ -1487,7 +1487,7 @@ static Reindex nfc_last[] = {
/* index tables for the database records */ /* index tables for the database records */
#define SHIFT1 5 #define SHIFT1 5
#define SHIFT2 3 #define SHIFT2 3
static unsigned char index0[] = { static const unsigned char index0[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 53, 53, 53, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 53, 53, 53,
@ -1737,7 +1737,7 @@ static unsigned char index0[] = {
74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 131, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 131,
}; };
static unsigned short index1[] = { static const unsigned short index1[] = {
0, 1, 0, 2, 3, 4, 5, 6, 7, 8, 8, 9, 10, 11, 11, 12, 13, 0, 0, 0, 14, 15, 0, 1, 0, 2, 3, 4, 5, 6, 7, 8, 8, 9, 10, 11, 11, 12, 13, 0, 0, 0, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 29, 31, 32, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 29, 31, 32,
33, 34, 35, 27, 30, 29, 27, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 33, 34, 35, 27, 30, 29, 27, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
@ -2042,7 +2042,7 @@ static unsigned short index1[] = {
854, 854, 854, 854, 854, 854, 854, 1119, 854, 854, 854, 854, 854, 854, 854, 1119,
}; };
static unsigned short index2[] = { static const unsigned short index2[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 2, 4, 3, 1, 1, 1, 1, 1, 1, 3, 3, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 2, 4, 3, 1, 1, 1, 1, 1, 1, 3, 3, 3, 2,
5, 6, 6, 7, 8, 7, 6, 6, 9, 10, 6, 11, 12, 13, 12, 12, 14, 14, 14, 14, 14, 5, 6, 6, 7, 8, 7, 6, 6, 9, 10, 6, 11, 12, 13, 12, 12, 14, 14, 14, 14, 14,
14, 14, 14, 14, 14, 12, 6, 15, 16, 15, 6, 6, 17, 17, 17, 17, 17, 17, 17, 14, 14, 14, 14, 14, 12, 6, 15, 16, 15, 6, 6, 17, 17, 17, 17, 17, 17, 17,
@ -2624,7 +2624,7 @@ static unsigned short index2[] = {
}; };
/* decomposition data */ /* decomposition data */
static unsigned short decomp_data[] = { static const unsigned short decomp_data[] = {
0, 257, 32, 514, 32, 776, 259, 97, 514, 32, 772, 259, 50, 259, 51, 514, 0, 257, 32, 514, 32, 776, 259, 97, 514, 32, 772, 259, 50, 259, 51, 514,
32, 769, 258, 956, 514, 32, 807, 259, 49, 259, 111, 772, 49, 8260, 52, 32, 769, 258, 956, 514, 32, 807, 259, 49, 259, 111, 772, 49, 8260, 52,
772, 49, 8260, 50, 772, 51, 8260, 52, 512, 65, 768, 512, 65, 769, 512, 772, 49, 8260, 50, 772, 51, 8260, 52, 512, 65, 768, 512, 65, 769, 512,
@ -3702,7 +3702,7 @@ static unsigned short decomp_data[] = {
/* index tables for the decomposition data */ /* index tables for the decomposition data */
#define DECOMP_SHIFT1 6 #define DECOMP_SHIFT1 6
#define DECOMP_SHIFT2 4 #define DECOMP_SHIFT2 4
static unsigned char decomp_index0[] = { static const unsigned char decomp_index0[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 13, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 13, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 14, 15, 5, 5, 5, 5, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 14, 15, 5, 5, 5, 5, 16, 5,
@ -3751,7 +3751,7 @@ static unsigned char decomp_index0[] = {
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
}; };
static unsigned short decomp_index1[] = { static const unsigned short decomp_index1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0,
25, 0, 26, 27, 0, 0, 0, 0, 0, 28, 0, 0, 29, 30, 31, 32, 33, 34, 35, 0, 25, 0, 26, 27, 0, 0, 0, 0, 0, 28, 0, 0, 29, 30, 31, 32, 33, 34, 35, 0,
@ -3825,7 +3825,7 @@ static unsigned short decomp_index1[] = {
0, 0, 0, 0, 0, 0,
}; };
static unsigned short decomp_index2[] = { static const unsigned short decomp_index2[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
3, 0, 6, 0, 0, 0, 0, 8, 0, 0, 11, 13, 15, 18, 0, 0, 20, 23, 25, 0, 27, 3, 0, 6, 0, 0, 0, 0, 8, 0, 0, 11, 13, 15, 18, 0, 0, 20, 23, 25, 0, 27,
31, 35, 0, 39, 42, 45, 48, 51, 54, 0, 57, 60, 63, 66, 69, 72, 75, 78, 81, 31, 35, 0, 39, 42, 45, 48, 51, 54, 0, 57, 60, 63, 66, 69, 72, 75, 78, 81,
@ -4414,7 +4414,7 @@ static unsigned short decomp_index2[] = {
/* NFC pairs */ /* NFC pairs */
#define COMP_SHIFT1 2 #define COMP_SHIFT1 2
#define COMP_SHIFT2 1 #define COMP_SHIFT2 1
static unsigned short comp_index0[] = { static const unsigned short comp_index0[] = {
0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 5, 6, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 5, 6,
0, 0, 0, 0, 7, 0, 8, 9, 0, 0, 0, 10, 11, 12, 0, 0, 0, 0, 13, 14, 15, 16, 0, 0, 0, 0, 7, 0, 8, 9, 0, 0, 0, 10, 11, 12, 0, 0, 0, 0, 13, 14, 15, 16,
0, 0, 0, 17, 18, 19, 20, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 23, 24, 0, 0, 0, 0, 0, 17, 18, 19, 20, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, 23, 24, 0, 0,
@ -4538,7 +4538,7 @@ static unsigned short comp_index0[] = {
0, 0, 0, 0, 0, 0, 541, 0, 0, 0, 0, 0, 0, 542, 0, 0, 0, 0, 0, 0, 543, 0, 0, 0, 0, 0, 0, 541, 0, 0, 0, 0, 0, 0, 542, 0, 0, 0, 0, 0, 0, 543,
}; };
static unsigned short comp_index1[] = { static const unsigned short comp_index1[] = {
0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 4, 5, 6, 7, 8, 9, 10, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 4, 5, 6, 7, 8, 9, 10, 0,
11, 12, 0, 13, 0, 0, 0, 14, 15, 0, 0, 0, 0, 16, 0, 0, 17, 18, 0, 19, 0, 11, 12, 0, 13, 0, 0, 0, 14, 15, 0, 0, 0, 0, 16, 0, 0, 17, 18, 0, 19, 0,
20, 0, 0, 0, 0, 21, 0, 0, 0, 0, 22, 0, 23, 0, 0, 24, 0, 25, 26, 0, 27, 0, 20, 0, 0, 0, 0, 21, 0, 0, 0, 0, 22, 0, 23, 0, 0, 24, 0, 25, 26, 0, 27, 0,
@ -4651,7 +4651,7 @@ static unsigned short comp_index1[] = {
725, 0, 0, 0, 726, 725, 0, 0, 0, 726,
}; };
static unsigned int comp_data[] = { static const unsigned int comp_data[] = {
0, 0, 0, 8814, 0, 8800, 0, 8815, 192, 193, 194, 195, 256, 258, 550, 196, 0, 0, 0, 8814, 0, 8800, 0, 8815, 192, 193, 194, 195, 256, 258, 550, 196,
7842, 197, 0, 461, 512, 514, 0, 7840, 0, 7680, 260, 0, 7682, 0, 0, 7684, 7842, 197, 0, 461, 512, 514, 0, 7840, 0, 7680, 260, 0, 7682, 0, 0, 7684,
7686, 0, 0, 262, 264, 0, 266, 0, 0, 268, 0, 199, 7690, 0, 0, 270, 0, 7686, 0, 0, 262, 264, 0, 266, 0, 0, 268, 0, 199, 7690, 0, 0, 270, 0,