include/freetype/internal/ftserv.h, src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c, src/base/ftpfr.c, src/base/ftwinfnt.c, src/base/ftxf86.c, src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/winfonts/winfnt.h, include/freetype/internal/service/svwinfnt.h,: simplification of service lookup macros, updating the PFR and WINFNT font drivers to new servicesLAYOUT
parent
b0bed97a6c
commit
a7053295b4
13 changed files with 285 additions and 225 deletions
@ -1,104 +0,0 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* fnttypes.h */ |
||||
/* */ |
||||
/* Basic Windows FNT/FON type definitions and interface (specification */ |
||||
/* only). */ |
||||
/* */ |
||||
/* Copyright 1996-2001, 2002, 2003 by */ |
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
||||
/* */ |
||||
/* This file is part of the FreeType project, and may only be used, */ |
||||
/* modified, and distributed under the terms of the FreeType project */ |
||||
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ |
||||
/* this file you indicate that you have read the license and */ |
||||
/* understand and accept it fully. */ |
||||
/* */ |
||||
/***************************************************************************/ |
||||
|
||||
|
||||
#ifndef __FNTTYPES_H__ |
||||
#define __FNTTYPES_H__ |
||||
|
||||
|
||||
#include <ft2build.h> |
||||
#include FT_FREETYPE_H |
||||
#include FT_WINFONTS_H |
||||
|
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
|
||||
typedef struct WinMZ_HeaderRec_ |
||||
{ |
||||
FT_UShort magic; |
||||
/* skipped content */ |
||||
FT_UShort lfanew; |
||||
|
||||
} WinMZ_HeaderRec; |
||||
|
||||
|
||||
typedef struct WinNE_HeaderRec_ |
||||
{ |
||||
FT_UShort magic; |
||||
/* skipped content */ |
||||
FT_UShort resource_tab_offset; |
||||
FT_UShort rname_tab_offset; |
||||
|
||||
} WinNE_HeaderRec; |
||||
|
||||
|
||||
typedef struct WinNameInfoRec_ |
||||
{ |
||||
FT_UShort offset; |
||||
FT_UShort length; |
||||
FT_UShort flags; |
||||
FT_UShort id; |
||||
FT_UShort handle; |
||||
FT_UShort usage; |
||||
|
||||
} WinNameInfoRec; |
||||
|
||||
|
||||
typedef struct WinResourceInfoRec_ |
||||
{ |
||||
FT_UShort type_id; |
||||
FT_UShort count; |
||||
|
||||
} WinResourceInfoRec; |
||||
|
||||
|
||||
#define WINFNT_MZ_MAGIC 0x5A4D |
||||
#define WINFNT_NE_MAGIC 0x454E |
||||
|
||||
|
||||
typedef struct FNT_FontRec_ |
||||
{ |
||||
FT_ULong offset; |
||||
FT_Int size_shift; |
||||
|
||||
FT_WinFNT_HeaderRec header; |
||||
|
||||
FT_Byte* fnt_frame; |
||||
FT_ULong fnt_size; |
||||
|
||||
} FNT_FontRec, *FNT_Font; |
||||
|
||||
|
||||
typedef struct FNT_FaceRec_ |
||||
{ |
||||
FT_FaceRec root; |
||||
FNT_Font font; |
||||
|
||||
FT_CharMap charmap_handle; |
||||
FT_CharMapRec charmap; /* a single charmap per face */ |
||||
|
||||
} FNT_FaceRec, *FNT_Face; |
||||
|
||||
|
||||
FT_END_HEADER |
||||
|
||||
#endif /* __FNTTYPES_H__ */ |
||||
|
||||
|
||||
/* END */ |
@ -0,0 +1,47 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* svwinfnt.h */ |
||||
/* */ |
||||
/* The FreeType Windows FNT/FONT service */ |
||||
/* */ |
||||
/* Copyright 2003 by */ |
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
||||
/* */ |
||||
/* This file is part of the FreeType project, and may only be used, */ |
||||
/* modified, and distributed under the terms of the FreeType project */ |
||||
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ |
||||
/* this file you indicate that you have read the license and */ |
||||
/* understand and accept it fully. */ |
||||
/* */ |
||||
/***************************************************************************/ |
||||
|
||||
|
||||
#ifndef __SVWINFNT_H__ |
||||
#define __SVWINFNT_H__ |
||||
|
||||
|
||||
#include FT_INTERNAL_SERVICE_H |
||||
#include FT_WINFONTS_H |
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
|
||||
#define FT_SERVICE_ID_WINFNT "winfonts" |
||||
|
||||
typedef FT_Error (*FT_WinFnt_GetHeaderFunc)( FT_Face face, |
||||
FT_WinFNT_HeaderRec *aheader ); |
||||
|
||||
FT_DEFINE_SERVICE( WinFnt ) |
||||
{ |
||||
FT_WinFnt_GetHeaderFunc get_header; |
||||
}; |
||||
|
||||
/* */ |
||||
|
||||
FT_END_HEADER |
||||
|
||||
|
||||
#endif /* __SVWINFNT_H__ */ |
||||
|
||||
|
||||
/* END */ |
Loading…
Reference in new issue