summaryrefslogtreecommitdiff
path: root/pango/opentype/ftglue.h
diff options
context:
space:
mode:
Diffstat (limited to 'pango/opentype/ftglue.h')
-rw-r--r--pango/opentype/ftglue.h21
1 files changed, 16 insertions, 5 deletions
diff --git a/pango/opentype/ftglue.h b/pango/opentype/ftglue.h
index 84de7f35..9b237dda 100644
--- a/pango/opentype/ftglue.h
+++ b/pango/opentype/ftglue.h
@@ -46,11 +46,17 @@
#include <ft2build.h>
#include FT_FREETYPE_H
+#include "harfbuzz-open.h"
+
FT_BEGIN_HEADER
/* utility macros */
+#ifndef HB_Error
+#define HB_Error FT_Error
+#endif
+
#define SET_ERR(c) ( (error = (c)) != 0 )
#ifndef FTGLUE_API
@@ -88,18 +94,18 @@ FT_BEGIN_HEADER
FTGLUE_API( FT_Long )
_hb_ftglue_stream_pos( FT_Stream stream );
-FTGLUE_API( FT_Error )
+FTGLUE_API( HB_Error )
_hb_ftglue_stream_seek( FT_Stream stream,
FT_Long pos );
-FTGLUE_API( FT_Error )
+FTGLUE_API( HB_Error )
_hb_ftglue_stream_frame_enter( FT_Stream stream,
FT_ULong size );
FTGLUE_API( void )
_hb_ftglue_stream_frame_exit( FT_Stream stream );
-FTGLUE_API( FT_Error )
+FTGLUE_API( HB_Error )
_hb_ftglue_face_goto_table( FT_Face face,
FT_ULong tag,
FT_Stream stream );
@@ -132,19 +138,24 @@ _hb_ftglue_face_goto_table( FT_Face face,
FTGLUE_API( FT_Pointer )
_hb_ftglue_alloc( FT_Memory memory,
FT_ULong size,
- FT_Error *perror_ );
+ HB_Error *perror_ );
FTGLUE_API( FT_Pointer )
_hb_ftglue_realloc( FT_Memory memory,
FT_Pointer block,
FT_ULong old_size,
FT_ULong new_size,
- FT_Error *perror_ );
+ HB_Error *perror_ );
FTGLUE_API( void )
_hb_ftglue_free( FT_Memory memory,
FT_Pointer block );
+/* abuse these private header/source files */
+
+/* helper func to set a breakpoint on */
+HB_Error _hb_err (HB_Error code);
+
FT_END_HEADER
#endif /* FTGLUE_H */