* include/freetype/internal/cfftypes.h, src/cff/cfftypes.h,
src/cff/cffload.h, src/cff/cffobjs.h, src/cff/cffparse.h,
include/freetype/internal/services/svbdf.h: moving "cfftypes.h" from
'include/freetype/internal' to 'src/cff' since no other modules needs
to known about these types
* include/freetype/internal/t42types.h,
include/freetype/internal/internal.h, src/type42/t42objs.h,
src/type42/t42drivr.c, src/type42/t42types.h: moving "t42types.h" from
'include/freetype/internal' to 'src/type42' since no other modules needs
to known about these types
* src/gzip/infblock.c: removing compiler warning
* include/freetype/internal/services/svpsinfo.h,
include/freetype/internal/ftserv.h, src/cff/cffdrivr.c,
src/cid/ciddrivr.c, src/type1/t1driver.c, src/type42/t42drivr.c,
src/base/fttype1.c: migrating to FT_SERVICE_ID_POSTSCRIPT_INFO defined
in "svpsinfo.h", removing some sad hacks.
LAYOUT
David Turner
21 years ago
parent
b000131332
commit
1ce498b0e7
34 changed files with 233 additions and 160 deletions
@ -1,58 +0,0 @@ |
||||
/* bdftypes.h
|
||||
|
||||
FreeType font driver for bdf fonts |
||||
|
||||
Copyright (C) 2001, 2002 by |
||||
Francesco Zappa Nardelli |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
of this software and associated documentation files (the "Software"), to deal |
||||
in the Software without restriction, including without limitation the rights |
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
copies of the Software, and to permit persons to whom the Software is |
||||
furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included in |
||||
all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||
THE SOFTWARE. |
||||
*/ |
||||
|
||||
#ifndef __BDFTYPES_H__ |
||||
#define __BDFTYPES_H__ |
||||
|
||||
#include <ft2build.h> |
||||
#include FT_FREETYPE_H |
||||
#include FT_BDF_H |
||||
|
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
|
||||
typedef struct BDF_Public_FaceRec_ |
||||
{ |
||||
FT_FaceRec root; |
||||
|
||||
char* charset_encoding; |
||||
char* charset_registry; |
||||
|
||||
} BDF_Public_FaceRec, *BDF_Public_Face; |
||||
|
||||
|
||||
typedef FT_Error (*BDF_GetPropertyFunc)( FT_Face face, |
||||
const char* prop_name, |
||||
BDF_PropertyRec *aproperty ); |
||||
|
||||
FT_END_HEADER |
||||
|
||||
|
||||
#endif /* __BDFTYPES_H__ */ |
||||
|
||||
|
||||
/* END */ |
||||
@ -0,0 +1,30 @@ |
||||
#ifndef __SVPSINFO_H__ |
||||
#define __SVPSINFO_H__ |
||||
|
||||
#include FT_INTERNAL_SERVICE_H |
||||
#include FT_INTERNAL_TYPE1_TYPES_H |
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
|
||||
#define FT_SERVICE_ID_POSTSCRIPT_INFO "postscript-info" |
||||
|
||||
typedef FT_Error (*PS_GetFontInfoFunc)( FT_Face face, |
||||
PS_FontInfoRec* afont_info ); |
||||
|
||||
typedef FT_Int (*PS_HasGlyphNamesFunc)( FT_Face face ); |
||||
|
||||
FT_DEFINE_SERVICE( PsInfo ) |
||||
{ |
||||
PS_GetFontInfoFunc ps_get_font_info; |
||||
PS_HasGlyphNamesFunc ps_has_glyph_names; |
||||
}; |
||||
|
||||
/* */ |
||||
|
||||
|
||||
FT_END_HEADER |
||||
|
||||
|
||||
|
||||
#endif /* __SVPSINFO_H__ */ |
||||
Loading…
Reference in new issue