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

[hb-old] Rename hb_buffer_* to HB_Buffer_*

This commit is contained in:
Behdad Esfahbod 2012-07-24 19:20:19 -04:00
parent 1512a73575
commit fb47209c5b
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hb-old/harfbuzz-buffer.c
View File

@ -60,7 +60,7 @@
/* Internal API */ /* Internal API */
static HB_Error static HB_Error
hb_buffer_ensure( HB_Buffer buffer, HB_Buffer_ensure( HB_Buffer buffer,
HB_UInt size ) HB_UInt size )
{ {
HB_UInt new_allocated = buffer->allocated; HB_UInt new_allocated = buffer->allocated;
@ -106,7 +106,7 @@ hb_buffer_ensure( HB_Buffer buffer,
} }
static HB_Error static HB_Error
hb_buffer_duplicate_out_buffer( HB_Buffer buffer ) HB_Buffer_duplicate_out_buffer( HB_Buffer buffer )
{ {
if ( !buffer->alt_string ) if ( !buffer->alt_string )
{ {
@ -126,7 +126,7 @@ hb_buffer_duplicate_out_buffer( HB_Buffer buffer )
/* Public API */ /* Public API */
HB_Error HB_Error
hb_buffer_new( HB_Buffer *pbuffer ) HB_Buffer_new( HB_Buffer *pbuffer )
{ {
HB_Buffer buffer; HB_Buffer buffer;
HB_Error error; HB_Error error;
@ -139,7 +139,7 @@ hb_buffer_new( HB_Buffer *pbuffer )
buffer->alt_string = NULL; buffer->alt_string = NULL;
buffer->positions = NULL; buffer->positions = NULL;
hb_buffer_clear( buffer ); HB_Buffer_clear( buffer );
*pbuffer = buffer; *pbuffer = buffer;
@ -147,7 +147,7 @@ hb_buffer_new( HB_Buffer *pbuffer )
} }
void void
hb_buffer_free( HB_Buffer buffer ) HB_Buffer_free( HB_Buffer buffer )
{ {
FREE( buffer->in_string ); FREE( buffer->in_string );
FREE( buffer->alt_string ); FREE( buffer->alt_string );
@ -157,7 +157,7 @@ hb_buffer_free( HB_Buffer buffer )
} }
void void
hb_buffer_clear( HB_Buffer buffer ) HB_Buffer_clear( HB_Buffer buffer )
{ {
buffer->in_length = 0; buffer->in_length = 0;
buffer->out_length = 0; buffer->out_length = 0;
@ -169,7 +169,7 @@ hb_buffer_clear( HB_Buffer buffer )
} }
HB_Error HB_Error
hb_buffer_add_glyph( HB_Buffer buffer, HB_Buffer_add_glyph( HB_Buffer buffer,
HB_UInt glyph_index, HB_UInt glyph_index,
HB_UInt properties, HB_UInt properties,
HB_UInt cluster ) HB_UInt cluster )
@ -177,7 +177,7 @@ hb_buffer_add_glyph( HB_Buffer buffer,
HB_Error error; HB_Error error;
HB_GlyphItem glyph; HB_GlyphItem glyph;
error = hb_buffer_ensure( buffer, buffer->in_length + 1 ); error = HB_Buffer_ensure( buffer, buffer->in_length + 1 );
if ( error ) if ( error )
return error; return error;
@ -277,13 +277,13 @@ _hb_buffer_add_output_glyphs( HB_Buffer buffer,
HB_UInt properties; HB_UInt properties;
HB_UInt cluster; 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 ) if ( error )
return error; return error;
if ( !buffer->separate_out ) if ( !buffer->separate_out )
{ {
error = hb_buffer_duplicate_out_buffer( buffer ); error = HB_Buffer_duplicate_out_buffer( buffer );
if ( error ) if ( error )
return error; return error;
} }
@ -332,7 +332,7 @@ _hb_buffer_copy_output_glyph ( HB_Buffer buffer )
{ {
HB_Error error; HB_Error error;
error = hb_buffer_ensure( buffer, buffer->out_pos + 1 ); error = HB_Buffer_ensure( buffer, buffer->out_pos + 1 );
if ( error ) if ( error )
return error; return error;

8
src/hb-old/harfbuzz-buffer.h
View File

@ -79,16 +79,16 @@ typedef struct HB_BufferRec_{
} HB_BufferRec, *HB_Buffer; } HB_BufferRec, *HB_Buffer;
HB_Error HB_Error
hb_buffer_new( HB_Buffer *buffer ); HB_Buffer_new( HB_Buffer *buffer );
void void
hb_buffer_free( HB_Buffer buffer ); HB_Buffer_free( HB_Buffer buffer );
void void
hb_buffer_clear( HB_Buffer buffer ); HB_Buffer_clear( HB_Buffer buffer );
HB_Error HB_Error
hb_buffer_add_glyph( HB_Buffer buffer, HB_Buffer_add_glyph( HB_Buffer buffer,
HB_UInt glyph_index, HB_UInt glyph_index,
HB_UInt properties, HB_UInt properties,
HB_UInt cluster ); HB_UInt cluster );

8
src/hb-old/harfbuzz-shaper.cpp
View File

@ -1009,7 +1009,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
for (unsigned int i = 0; i < HB_ScriptCount; ++i) for (unsigned int i = 0; i < HB_ScriptCount; ++i)
face->supported_scripts[i] = checkScript(face, 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); HB_FreeFace(face);
return 0; return 0;
} }
@ -1028,7 +1028,7 @@ void HB_FreeFace(HB_Face face)
if (face->gdef) if (face->gdef)
HB_Done_GDEF_Table(face->gdef); HB_Done_GDEF_Table(face->gdef);
if (face->buffer) if (face->buffer)
hb_buffer_free(face->buffer); HB_Buffer_free(face->buffer);
if (face->tmpAttributes) if (face->tmpAttributes)
free(face->tmpAttributes); free(face->tmpAttributes);
if (face->tmpLogClusters) if (face->tmpLogClusters)
@ -1139,7 +1139,7 @@ HB_Bool HB_OpenTypeShape(HB_ShaperItem *item, const hb_uint32 *properties)
face->length = item->num_glyphs; 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)); tmpAttributes = (HB_GlyphAttributes *) realloc(face->tmpAttributes, face->length*sizeof(HB_GlyphAttributes));
if (!tmpAttributes) if (!tmpAttributes)
@ -1152,7 +1152,7 @@ HB_Bool HB_OpenTypeShape(HB_ShaperItem *item, const hb_uint32 *properties)
face->tmpLogClusters = tmpLogClusters; face->tmpLogClusters = tmpLogClusters;
for (int i = 0; i < face->length; ++i) { 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->tmpAttributes[i] = item->attributes[i];
face->tmpLogClusters[i] = item->log_clusters[i]; face->tmpLogClusters[i] = item->log_clusters[i];
} }