diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-11 13:25:20 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-11 13:25:20 +0000 |
commit | f33df6d448eecaace37506c4fc1e897bb3785edc (patch) | |
tree | 5a89a9205e86dd4ece68258f39e3a4943a5338f5 /Build/source/texk/dvipdfmx/src/sfnt.h | |
parent | 5e5667f37e392a9c676b5c89b304d5bcdacce9ff (diff) |
Reduce dvipdfmx/xdvipdfmx diffs
git-svn-id: svn://tug.org/texlive/trunk@28796 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/src/sfnt.h')
-rw-r--r-- | Build/source/texk/dvipdfmx/src/sfnt.h | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/Build/source/texk/dvipdfmx/src/sfnt.h b/Build/source/texk/dvipdfmx/src/sfnt.h index ff8fac67a38..29ffeeec98b 100644 --- a/Build/source/texk/dvipdfmx/src/sfnt.h +++ b/Build/source/texk/dvipdfmx/src/sfnt.h @@ -23,10 +23,20 @@ #ifndef _SFNT_H_ #define _SFNT_H_ +#if HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H_ */ + #include "mfileio.h" #include "numbers.h" #include "pdfobj.h" +#ifdef XETEX +#include "ft2build.h" +#include FT_FREETYPE_H +#include FT_TRUETYPE_TABLES_H +#endif + /* Acoid conflict with CHAR from <winnt.h>. */ #define CHAR SFNT_CHAR @@ -76,16 +86,39 @@ struct sfnt_table_directory typedef struct { - FILE *stream; int type; - ULONG offset; struct sfnt_table_directory *directory; +#ifdef XETEX + FT_Face ft_face; + long loc; +#else + FILE *stream; +#endif + ULONG offset; } sfnt; /* Convert sfnt "fixed" type to double */ #define fixed(a) ((double)((a)%0x10000L)/(double)(0x10000L) + \ (a)/0x10000L - (((a)/0x10000L > 0x7fffL) ? 0x10000L : 0)) +#ifdef XETEX +UNSIGNED_BYTE ft_unsigned_byte(sfnt* f); +SIGNED_BYTE ft_signed_byte(sfnt* f); +UNSIGNED_PAIR ft_unsigned_pair(sfnt* f); +SIGNED_PAIR ft_signed_pair(sfnt* f); +UNSIGNED_QUAD ft_unsigned_quad(sfnt* f); +unsigned long ft_read(unsigned char* buf, unsigned long len, sfnt* f); + +#define sfnt_get_byte(s) ((BYTE) ft_unsigned_byte(s)) +#define sfnt_get_char(s) ((CHAR) ft_signed_byte (s)) +#define sfnt_get_ushort(s) ((USHORT) ft_unsigned_pair(s)) +#define sfnt_get_short(s) ((SHORT) ft_signed_pair (s)) +#define sfnt_get_ulong(s) ((ULONG) ft_unsigned_quad(s)) +#define sfnt_get_long(s) ((LONG) ft_signed_quad (s)) + +#define sfnt_seek_set(s,o) (s)->loc = (o) +#define sfnt_read(b,l,s) ft_read((b), (l), (s)) +#else /* get_***_*** from numbers.h */ #define sfnt_get_byte(s) ((BYTE) get_unsigned_byte((s)->stream)) #define sfnt_get_char(s) ((CHAR) get_signed_byte ((s)->stream)) @@ -96,6 +129,7 @@ typedef struct #define sfnt_seek_set(s,o) seek_absolute((s)->stream, (o)) #define sfnt_read(b,l,s) fread((b), 1, (l), (s)->stream) +#endif extern int put_big_endian (void *s, LONG q, int n); @@ -104,9 +138,13 @@ extern int put_big_endian (void *s, LONG q, int n); #define sfnt_put_ulong(s,v) put_big_endian((s), v, 4); #define sfnt_put_long(s,v) put_big_endian((s), v, 4); +#ifdef XETEX +extern sfnt *sfnt_open (FT_Face face, int accept_types); +#else extern sfnt *sfnt_open (FILE *fp); -extern void sfnt_close (sfnt *sfont); extern sfnt *dfont_open (FILE *fp, int index); +#endif +extern void sfnt_close (sfnt *sfont); /* table directory */ extern int sfnt_read_table_directory (sfnt *sfont, ULONG offset); |