summaryrefslogtreecommitdiff
path: root/src/cid/cidriver.c
diff options
context:
space:
mode:
authorDavid Turner <david@freetype.org>2003-09-29 20:33:37 +0000
committerDavid Turner <david@freetype.org>2003-09-29 20:33:37 +0000
commitb72d8a85212e1dc2dc103c28e19a4f4a2d71767e (patch)
treea149b5916e17de9e8e46766603ad112477b6476a /src/cid/cidriver.c
parenta259b6dddbdf1e23346bd8d9816c5c68adb7d433 (diff)
downloadfreetype2-b72d8a85212e1dc2dc103c28e19a4f4a2d71767e.tar.gz
* include/freetype/internal/services/svpsname.h (added),
include/freetype/internal/psnames.h (removed), include/freetype/internal/internal.h (FT_SERVICE_POSTSCRIPT_NAMES): added new service to handle glyph name dictionaries, replacing the old internal header named "psnames.h" by "services/svpsname.h" note that this is different from "services/svpostnm.h" which only handles the retrieval of Postscript font name for a given face. (should we merge these two services into a single header ??) * include/freetype/internal/ftserv.h: adding FT_FACE_FIND_GLOBAL_SERVICE (used to lookup a service globally, instead of only within the current module) * include/freetype/internal/ftobjs.h, src/base/ftobjs.c: adding the new base function ft_module_get_service
Diffstat (limited to 'src/cid/cidriver.c')
-rw-r--r--src/cid/cidriver.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 704d47dbd..d0d084328 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -21,7 +21,6 @@
#include "cidgload.h"
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
-#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include "ciderrs.h"
@@ -42,7 +41,7 @@
* POSTSCRIPT NAME SERVICE
*
*/
-
+
static const char*
cid_get_postscript_name( CID_Face face )
{
@@ -55,8 +54,8 @@
return result;
}
-
- static const FT_Service_PsNameRec cid_service_ps_name =
+
+ static const FT_Service_PsFontNameRec cid_service_ps_name =
{
(FT_PsName_GetFunc) cid_get_postscript_name
};
@@ -66,10 +65,10 @@
* SERVICE LIST
*
*/
-
+
static const FT_ServiceDescRec cid_services[] =
{
- { FT_SERVICE_ID_POSTSCRIPT_NAME, &cid_service_ps_name },
+ { FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &cid_service_ps_name },
{ FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_CID },
{ NULL, NULL }
};