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

[coretext] More scratch buffer fixes

This commit is contained in:
Behdad Esfahbod 2013-11-13 14:33:57 -05:00
parent 16f175cb2e
commit 8fcadb9cf9
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hb-coretext.cc
View File

@ -553,11 +553,21 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
} HB_STMT_END; } HB_STMT_END;
unsigned int scratch_size; unsigned int scratch_size;
char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); int *scratch = buffer->get_scratch_buffer (&scratch_size);
#define ALLOCATE_ARRAY(Type, name, len) \
Type *name = (Type *) scratch; \
{ \
unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
assert (_consumed <= scratch_size); \
scratch += _consumed; \
scratch_size -= _consumed; \
}
#define utf16_index() var1.u32 #define utf16_index() var1.u32
UniChar *pchars = (UniChar *) scratch; ALLOCATE_ARRAY (UniChar, pchars, buffer->len * 2);
unsigned int chars_len = 0; unsigned int chars_len = 0;
for (unsigned int i = 0; i < buffer->len; i++) { for (unsigned int i = 0; i < buffer->len; i++) {
hb_codepoint_t c = buffer->info[i].codepoint; hb_codepoint_t c = buffer->info[i].codepoint;
@ -586,7 +596,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
if (num_features) if (num_features)
{ {
unsigned int *log_clusters = (unsigned int *) (pchars + chars_len); ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len);
/* Need log_clusters to assign features. */ /* Need log_clusters to assign features. */
chars_len = 0; chars_len = 0;
@ -650,15 +660,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
unsigned int scratch_size; unsigned int scratch_size;
int *scratch = buffer->get_scratch_buffer (&scratch_size); int *scratch = buffer->get_scratch_buffer (&scratch_size);
#define ALLOCATE_ARRAY(Type, name, len) \
Type *name = (Type *) scratch; \
{ \
unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
assert (_consumed <= scratch_size); \
scratch += _consumed; \
scratch_size -= _consumed; \
}
/* Testing indicates that CTRunGetGlyphsPtr, etc (almost?) always /* Testing indicates that CTRunGetGlyphsPtr, etc (almost?) always
* succeed, and so copying data to our own buffer will be rare. */ * succeed, and so copying data to our own buffer will be rare. */