summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/sfnt.h
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:38 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:38 +0000
commit796176898c849ec72156930daa2ea150b68c48a3 (patch)
treedf9ae1a767183ead147947882f8895cf07f2417a /Build/source/texk/dvipdfm-x/sfnt.h
parent31053cc388d6f0b348b297a3a0b950e8d707916a (diff)
Remove most of font related #ifdef XETEX
Almost all of this is not needed now since XeTeX’s native fonts are always passed by file name and face index now, so we can use original dvipdfmx direct file based code instead of using a FreeType font face. Has the side effect of fixing: https://sourceforge.net/p/xetex/bugs/97/ git-svn-id: svn://tug.org/texlive/trunk@34718 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/sfnt.h')
-rw-r--r--Build/source/texk/dvipdfm-x/sfnt.h34
1 files changed, 0 insertions, 34 deletions
diff --git a/Build/source/texk/dvipdfm-x/sfnt.h b/Build/source/texk/dvipdfm-x/sfnt.h
index b6de8760ad1..69271a229cd 100644
--- a/Build/source/texk/dvipdfm-x/sfnt.h
+++ b/Build/source/texk/dvipdfm-x/sfnt.h
@@ -25,12 +25,6 @@
#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
@@ -82,12 +76,7 @@ typedef struct
{
int type;
struct sfnt_table_directory *directory;
-#ifdef XETEX
- FT_Face ft_face;
- long loc;
-#else
FILE *stream;
-#endif
ULONG offset;
} sfnt;
@@ -95,24 +84,6 @@ typedef struct
#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(void* 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))
@@ -123,7 +94,6 @@ unsigned long ft_read(void* buf, unsigned long len, sfnt* f);
#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);
@@ -132,12 +102,8 @@ 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 sfnt *dfont_open (FILE *fp, int index);
-#endif
extern void sfnt_close (sfnt *sfont);
/* table directory */