diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-06-29 22:14:53 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-06-29 22:14:53 +0000 |
| commit | 05d75f6af2c01efff9af74f4c2151352e91c0f99 (patch) | |
| tree | ec8f00bf1ffa4a1ccd436093e4f2caba71fa1fd1 /pango/pango-coverage.c | |
| parent | 4e005cf17476ee08c73e7a1a2fb1133d9008be15 (diff) | |
| download | pango-05d75f6af2c01efff9af74f4c2151352e91c0f99.tar.gz | |
Fix various aspects of expanding coverage tables beyond the first 256
Thu Jun 29 18:13:47 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-coverage.c: Fix various aspects of expanding
coverage tables beyond the first 256 blocks. (Based on
patch from ChiDeok Hwang.)
Diffstat (limited to 'pango/pango-coverage.c')
| -rw-r--r-- | pango/pango-coverage.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index 4445705d..6a5ce4d2 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -61,14 +61,8 @@ pango_coverage_new (void) PangoCoverage *coverage = g_new (PangoCoverage, 1); coverage->n_blocks = N_BLOCKS_INCREMENT; - coverage->blocks = g_new (PangoBlockInfo, coverage->n_blocks); + coverage->blocks = g_new0 (PangoBlockInfo, coverage->n_blocks); coverage->ref_count = 1; - - for (i=0; i<coverage->n_blocks; i++) - { - coverage->blocks[i].data = NULL; - coverage->blocks[i].level = PANGO_COVERAGE_NONE; - } return coverage; } @@ -87,10 +81,11 @@ PangoCoverage * pango_coverage_copy (PangoCoverage *coverage) { int i; - PangoCoverage *result = g_new (PangoCoverage, 1); + PangoCoverage *result; g_return_val_if_fail (coverage != NULL, NULL); - + + result = g_new (PangoCoverage, 1); result->n_blocks = coverage->n_blocks; result->blocks = g_new (PangoBlockInfo, coverage->n_blocks); result->ref_count = 1; @@ -215,8 +210,14 @@ void pango_coverage_set (PangoCoverage *coverage, if (block_index > coverage->n_blocks) { - coverage->n_blocks += N_BLOCKS_INCREMENT; + int old_n_blocks = coverage->n_blocks; + + coverage->n_blocks = + N_BLOCKS_INCREMENT * ((block_index + N_BLOCKS_INCREMENT - 1) / N_BLOCKS_INCREMENT); + coverage->blocks = g_renew (PangoBlockInfo, coverage->blocks, coverage->n_blocks); + memset (coverage->blocks + old_n_blocks, 0, + sizeof (PangoBlockInfo) * (coverage->n_blocks - old_n_blocks)); } data = coverage->blocks[block_index].data; @@ -264,9 +265,9 @@ void pango_coverage_max (PangoCoverage *coverage, if (other->n_blocks > coverage->n_blocks) { - coverage->n_blocks += N_BLOCKS_INCREMENT; + coverage->n_blocks = other->n_blocks; coverage->blocks = g_renew (PangoBlockInfo, coverage->blocks, coverage->n_blocks); - + for (block_index = old_blocks; block_index < coverage->n_blocks; block_index++) { if (other->blocks[block_index].data) |