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

Even more cleanup and more type renames. 

2007-10-25  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/*: Even more cleanup and more type renames.
This commit is contained in:
Behdad Esfahbod 2007-10-25 23:37:11 +00:00 committed by Behdad Esfahbod
parent 282c60a0ee
commit ef1f481752
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/harfbuzz-buffer.h
View File

@ -14,8 +14,7 @@
#ifndef HARFBUZZ_BUFFER_H #ifndef HARFBUZZ_BUFFER_H
#define HARFBUZZ_BUFFER_H #define HARFBUZZ_BUFFER_H
#include <ft2build.h> #include "harfbuzz-global.h"
#include FT_FREETYPE_H
HB_BEGIN_HEADER HB_BEGIN_HEADER

6
src/harfbuzz-global.h
View File

@ -13,6 +13,9 @@
#ifndef HARFBUZZ_GLOBAL_H #ifndef HARFBUZZ_GLOBAL_H
#define HARFBUZZ_GLOBAL_H #define HARFBUZZ_GLOBAL_H
#include <ft2build.h>
#include FT_FREETYPE_H
#ifdef __cplusplus #ifdef __cplusplus
#define HB_BEGIN_HEADER extern "C" { #define HB_BEGIN_HEADER extern "C" {
#define HB_END_HEADER } #define HB_END_HEADER }
@ -23,11 +26,14 @@
HB_BEGIN_HEADER HB_BEGIN_HEADER
typedef unsigned char HB_Byte;
typedef signed char HB_Char;
typedef unsigned short HB_UShort; typedef unsigned short HB_UShort;
typedef signed short HB_Short; typedef signed short HB_Short;
typedef unsigned int HB_UInt; typedef unsigned int HB_UInt;
typedef signed int HB_Int; typedef signed int HB_Int;
typedef int HB_Bool; typedef int HB_Bool;
typedef void *HB_Pointer;
typedef enum { typedef enum {

16
src/harfbuzz-impl.c
View File

@ -25,12 +25,12 @@ _hb_log( const char* format, ... )
#endif #endif
/* only used internally */ /* only used internally */
static FT_Pointer static HB_Pointer
_hb_qalloc( HB_UInt size, _hb_qalloc( HB_UInt size,
HB_Error *perror ) HB_Error *perror )
{ {
HB_Error error = 0; HB_Error error = 0;
FT_Pointer block = NULL; HB_Pointer block = NULL;
if ( size > 0 ) if ( size > 0 )
{ {
@ -47,12 +47,12 @@ _hb_qalloc( HB_UInt size,
#define QALLOC(ptr,size) ( (ptr) = _hb_qalloc( (size), &error ), error != 0 ) #define QALLOC(ptr,size) ( (ptr) = _hb_qalloc( (size), &error ), error != 0 )
HB_INTERNAL FT_Pointer HB_INTERNAL HB_Pointer
_hb_alloc( HB_UInt size, _hb_alloc( HB_UInt size,
HB_Error *perror ) HB_Error *perror )
{ {
HB_Error error = 0; HB_Error error = 0;
FT_Pointer block = NULL; HB_Pointer block = NULL;
if ( size > 0 ) if ( size > 0 )
{ {
@ -68,12 +68,12 @@ _hb_alloc( HB_UInt size,
} }
HB_INTERNAL FT_Pointer HB_INTERNAL HB_Pointer
_hb_realloc( FT_Pointer block, _hb_realloc( HB_Pointer block,
HB_UInt new_size, HB_UInt new_size,
HB_Error *perror ) HB_Error *perror )
{ {
FT_Pointer block2 = NULL; HB_Pointer block2 = NULL;
HB_Error error = 0; HB_Error error = 0;
block2 = realloc( block, new_size ); block2 = realloc( block, new_size );
@ -89,7 +89,7 @@ _hb_realloc( FT_Pointer block,
HB_INTERNAL void HB_INTERNAL void
_hb_free( FT_Pointer block ) _hb_free( HB_Pointer block )
{ {
if ( block ) if ( block )
free( block ); free( block );

22
src/harfbuzz-impl.h
View File

@ -81,18 +81,18 @@ typedef FT_Stream HB_Stream;
#define GET_Byte() (*stream->cursor++) #define GET_Byte() (*stream->cursor++)
#define GET_Short() (stream->cursor += 2, (HB_Short)( \ #define GET_Short() (stream->cursor += 2, (HB_Short)( \
(*(((FT_Byte*)stream->cursor)-2) << 8) | \ (*(((HB_Byte*)stream->cursor)-2) << 8) | \
*(((FT_Byte*)stream->cursor)-1) \ *(((HB_Byte*)stream->cursor)-1) \
)) ))
#define GET_Long() (stream->cursor += 4, (HB_Int)( \ #define GET_Long() (stream->cursor += 4, (HB_Int)( \
(*(((FT_Byte*)stream->cursor)-4) << 24) | \ (*(((HB_Byte*)stream->cursor)-4) << 24) | \
(*(((FT_Byte*)stream->cursor)-3) << 16) | \ (*(((HB_Byte*)stream->cursor)-3) << 16) | \
(*(((FT_Byte*)stream->cursor)-2) << 8) | \ (*(((HB_Byte*)stream->cursor)-2) << 8) | \
*(((FT_Byte*)stream->cursor)-1) \ *(((HB_Byte*)stream->cursor)-1) \
)) ))
#define GET_Char() ((FT_Char)GET_Byte()) #define GET_Char() ((HB_Char)GET_Byte())
#define GET_UShort() ((HB_UShort)GET_Short()) #define GET_UShort() ((HB_UShort)GET_Short())
#define GET_ULong() ((HB_UInt)GET_Long()) #define GET_ULong() ((HB_UInt)GET_Long())
#define GET_Tag4() GET_ULong() #define GET_Tag4() GET_ULong()
@ -143,17 +143,17 @@ _hb_face_goto_table( FT_Face face,
#define ERR(err) _hb_err (err) #define ERR(err) _hb_err (err)
HB_INTERNAL FT_Pointer HB_INTERNAL HB_Pointer
_hb_alloc( HB_UInt size, _hb_alloc( HB_UInt size,
HB_Error *perror_ ); HB_Error *perror_ );
HB_INTERNAL FT_Pointer HB_INTERNAL HB_Pointer
_hb_realloc( FT_Pointer block, _hb_realloc( HB_Pointer block,
HB_UInt new_size, HB_UInt new_size,
HB_Error *perror_ ); HB_Error *perror_ );
HB_INTERNAL void HB_INTERNAL void
_hb_free( FT_Pointer block ); _hb_free( HB_Pointer block );
/* helper func to set a breakpoint on */ /* helper func to set a breakpoint on */

3
src/harfbuzz-open.h
View File

@ -13,9 +13,6 @@
#ifndef HARFBUZZ_OPEN_H #ifndef HARFBUZZ_OPEN_H
#define HARFBUZZ_OPEN_H #define HARFBUZZ_OPEN_H
#include <ft2build.h>
#include FT_FREETYPE_H
#include "harfbuzz-global.h" #include "harfbuzz-global.h"
HB_BEGIN_HEADER HB_BEGIN_HEADER