diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2012-07-24 19:20:19 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2012-07-25 11:11:22 -0400 |
commit | fb47209c5b3aa992faf18d1a3f78b9d7682cf62f (patch) | |
tree | 6125b49ef172e70859abcdbeb03e218bce032927 /src/hb-old | |
parent | 1512a7357513b72e2a07dda706a176bb23d694e9 (diff) |
[hb-old] Rename hb_buffer_* to HB_Buffer_*
Diffstat (limited to 'src/hb-old')
-rw-r--r-- | src/hb-old/harfbuzz-buffer.c | 22 | ||||
-rw-r--r-- | src/hb-old/harfbuzz-buffer.h | 8 | ||||
-rw-r--r-- | src/hb-old/harfbuzz-shaper.cpp | 8 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/hb-old/harfbuzz-buffer.c b/src/hb-old/harfbuzz-buffer.c index 4d4c1671..a85ee8d5 100644 --- a/src/hb-old/harfbuzz-buffer.c +++ b/src/hb-old/harfbuzz-buffer.c @@ -60,7 +60,7 @@ /* Internal API */ static HB_Error -hb_buffer_ensure( HB_Buffer buffer, +HB_Buffer_ensure( HB_Buffer buffer, HB_UInt size ) { HB_UInt new_allocated = buffer->allocated; @@ -106,7 +106,7 @@ hb_buffer_ensure( HB_Buffer buffer, } static HB_Error -hb_buffer_duplicate_out_buffer( HB_Buffer buffer ) +HB_Buffer_duplicate_out_buffer( HB_Buffer buffer ) { if ( !buffer->alt_string ) { @@ -126,7 +126,7 @@ hb_buffer_duplicate_out_buffer( HB_Buffer buffer ) /* Public API */ HB_Error -hb_buffer_new( HB_Buffer *pbuffer ) +HB_Buffer_new( HB_Buffer *pbuffer ) { HB_Buffer buffer; HB_Error error; @@ -139,7 +139,7 @@ hb_buffer_new( HB_Buffer *pbuffer ) buffer->alt_string = NULL; buffer->positions = NULL; - hb_buffer_clear( buffer ); + HB_Buffer_clear( buffer ); *pbuffer = buffer; @@ -147,7 +147,7 @@ hb_buffer_new( HB_Buffer *pbuffer ) } void -hb_buffer_free( HB_Buffer buffer ) +HB_Buffer_free( HB_Buffer buffer ) { FREE( buffer->in_string ); FREE( buffer->alt_string ); @@ -157,7 +157,7 @@ hb_buffer_free( HB_Buffer buffer ) } void -hb_buffer_clear( HB_Buffer buffer ) +HB_Buffer_clear( HB_Buffer buffer ) { buffer->in_length = 0; buffer->out_length = 0; @@ -169,7 +169,7 @@ hb_buffer_clear( HB_Buffer buffer ) } HB_Error -hb_buffer_add_glyph( HB_Buffer buffer, +HB_Buffer_add_glyph( HB_Buffer buffer, HB_UInt glyph_index, HB_UInt properties, HB_UInt cluster ) @@ -177,7 +177,7 @@ hb_buffer_add_glyph( HB_Buffer buffer, HB_Error error; HB_GlyphItem glyph; - error = hb_buffer_ensure( buffer, buffer->in_length + 1 ); + error = HB_Buffer_ensure( buffer, buffer->in_length + 1 ); if ( error ) return error; @@ -277,13 +277,13 @@ _hb_buffer_add_output_glyphs( HB_Buffer buffer, HB_UInt properties; HB_UInt cluster; - error = hb_buffer_ensure( buffer, buffer->out_pos + num_out ); + error = HB_Buffer_ensure( buffer, buffer->out_pos + num_out ); if ( error ) return error; if ( !buffer->separate_out ) { - error = hb_buffer_duplicate_out_buffer( buffer ); + error = HB_Buffer_duplicate_out_buffer( buffer ); if ( error ) return error; } @@ -332,7 +332,7 @@ _hb_buffer_copy_output_glyph ( HB_Buffer buffer ) { HB_Error error; - error = hb_buffer_ensure( buffer, buffer->out_pos + 1 ); + error = HB_Buffer_ensure( buffer, buffer->out_pos + 1 ); if ( error ) return error; diff --git a/src/hb-old/harfbuzz-buffer.h b/src/hb-old/harfbuzz-buffer.h index 0d7c2c2c..ea5d4046 100644 --- a/src/hb-old/harfbuzz-buffer.h +++ b/src/hb-old/harfbuzz-buffer.h @@ -79,16 +79,16 @@ typedef struct HB_BufferRec_{ } HB_BufferRec, *HB_Buffer; HB_Error -hb_buffer_new( HB_Buffer *buffer ); +HB_Buffer_new( HB_Buffer *buffer ); void -hb_buffer_free( HB_Buffer buffer ); +HB_Buffer_free( HB_Buffer buffer ); void -hb_buffer_clear( HB_Buffer buffer ); +HB_Buffer_clear( HB_Buffer buffer ); HB_Error -hb_buffer_add_glyph( HB_Buffer buffer, +HB_Buffer_add_glyph( HB_Buffer buffer, HB_UInt glyph_index, HB_UInt properties, HB_UInt cluster ); diff --git a/src/hb-old/harfbuzz-shaper.cpp b/src/hb-old/harfbuzz-shaper.cpp index 7d433eac..83921b85 100644 --- a/src/hb-old/harfbuzz-shaper.cpp +++ b/src/hb-old/harfbuzz-shaper.cpp @@ -1009,7 +1009,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc) for (unsigned int i = 0; i < HB_ScriptCount; ++i) face->supported_scripts[i] = checkScript(face, i); - if (hb_buffer_new(&face->buffer) != HB_Err_Ok) { + if (HB_Buffer_new(&face->buffer) != HB_Err_Ok) { HB_FreeFace(face); return 0; } @@ -1028,7 +1028,7 @@ void HB_FreeFace(HB_Face face) if (face->gdef) HB_Done_GDEF_Table(face->gdef); if (face->buffer) - hb_buffer_free(face->buffer); + HB_Buffer_free(face->buffer); if (face->tmpAttributes) free(face->tmpAttributes); if (face->tmpLogClusters) @@ -1139,7 +1139,7 @@ HB_Bool HB_OpenTypeShape(HB_ShaperItem *item, const hb_uint32 *properties) face->length = item->num_glyphs; - hb_buffer_clear(face->buffer); + HB_Buffer_clear(face->buffer); tmpAttributes = (HB_GlyphAttributes *) realloc(face->tmpAttributes, face->length*sizeof(HB_GlyphAttributes)); if (!tmpAttributes) @@ -1152,7 +1152,7 @@ HB_Bool HB_OpenTypeShape(HB_ShaperItem *item, const hb_uint32 *properties) face->tmpLogClusters = tmpLogClusters; for (int i = 0; i < face->length; ++i) { - hb_buffer_add_glyph(face->buffer, item->glyphs[i], properties ? properties[i] : 0, i); + HB_Buffer_add_glyph(face->buffer, item->glyphs[i], properties ? properties[i] : 0, i); face->tmpAttributes[i] = item->attributes[i]; face->tmpLogClusters[i] = item->log_clusters[i]; } |