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

Minor

This commit is contained in:
Behdad Esfahbod 2012-04-23 22:18:54 -04:00
parent d2984a241e
commit 8e3715f8a1
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-buffer-private.hh
View File

@ -104,7 +104,7 @@ struct _hb_buffer_t {
const uint16_t *glyph_data_be);
HB_INTERNAL void replace_glyphs (unsigned int num_in,
unsigned int num_out,
const uint16_t *glyph_data);
const hb_codepoint_t *glyph_data);
HB_INTERNAL void replace_glyph (hb_codepoint_t glyph_index);
/* Makes a copy of the glyph at idx to output and replace glyph_index */
HB_INTERNAL void output_glyph (hb_codepoint_t glyph_index);

2
src/hb-buffer.cc
View File

@ -271,7 +271,7 @@ hb_buffer_t::replace_glyphs_be16 (unsigned int num_in,
void
hb_buffer_t::replace_glyphs (unsigned int num_in,
unsigned int num_out,
const uint16_t *glyph_data)
const uint32_t *glyph_data)
{
if (!make_room_for (num_in, num_out)) return;

5
src/hb-graphite2.cc
View File

@ -247,11 +247,10 @@ _hb_graphite_shape (hb_font_t *font,
features++;
}
unsigned short *gids = NULL;
hb_codepoint_t *gids = NULL, *pg;
hb_gr_cluster_t *clusters = NULL;
gr_segment *seg = NULL;
uint32_t *text = NULL;
unsigned short *pg;
const gr_slot *is;
unsigned int ci = 0, ic = 0;
float curradvx = 0., curradvy = 0.;
@ -280,7 +279,7 @@ _hb_graphite_shape (hb_font_t *font,
clusters = (hb_gr_cluster_t *) calloc (charlen, sizeof (hb_gr_cluster_t));
if (!glyphlen || !clusters) goto dieout;
gids = (uint16_t *) malloc (glyphlen * sizeof (uint16_t));
gids = (hb_codepoint_t *) malloc (glyphlen * sizeof (hb_codepoint_t));
if (!gids) goto dieout;
pg = gids;

2
src/hb-ot-shape-complex-arabic.cc
View File

@ -221,7 +221,7 @@ arabic_fallback_shape (hb_font_t *font, hb_buffer_t *buffer)
/* Mandatory ligatures */
buffer->clear_output ();
for (buffer->idx = 0; buffer->idx + 1 < count;) {
uint16_t ligature = get_ligature (buffer->info[buffer->idx].codepoint,
hb_codepoint_t ligature = get_ligature (buffer->info[buffer->idx].codepoint,
buffer->info[buffer->idx + 1].codepoint);
if (likely (!ligature) || !(hb_font_get_glyph (font, ligature, 0, &glyph))) {
buffer->next_glyph ();

4
src/hb-ot-shape-complex-misc.cc
View File

@ -148,8 +148,8 @@ _hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map, hb_buffer_t *buffer, hb
}
/* Is SARA AM. Decompose and reorder. */
uint16_t decomposed[2] = {uint16_t (NIKHAHIT_FROM_SARA_AM (u)),
uint16_t (SARA_AA_FROM_SARA_AM (u))};
hb_codepoint_t decomposed[2] = {hb_codepoint_t (NIKHAHIT_FROM_SARA_AM (u)),
hb_codepoint_t (SARA_AA_FROM_SARA_AM (u))};
buffer->replace_glyphs (1, 2, decomposed);
if (unlikely (buffer->in_error))
return;