From dd3335aa896dc5a01d7c60e1b0b1faa638304b75 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 16 Apr 2020 23:09:51 +1000 Subject: [PATCH] Remove unused FT_Get_PS stuff --- src/ClassiCube.vcxproj | 1 - src/ClassiCube.vcxproj.filters | 3 - src/_fttype1.c | 127 --------- src/freetype/cffdrivr.c | 76 +----- src/freetype/cidriver.c | 29 --- src/freetype/svpsinfo.h | 86 ------ src/freetype/t1driver.c | 464 --------------------------------- src/freetype/t1tables.h | 310 ---------------------- 8 files changed, 2 insertions(+), 1094 deletions(-) delete mode 100644 src/_fttype1.c delete mode 100644 src/freetype/svpsinfo.h diff --git a/src/ClassiCube.vcxproj b/src/ClassiCube.vcxproj index 294fe87e4..c231a01b4 100644 --- a/src/ClassiCube.vcxproj +++ b/src/ClassiCube.vcxproj @@ -316,7 +316,6 @@ - diff --git a/src/ClassiCube.vcxproj.filters b/src/ClassiCube.vcxproj.filters index 73e3b1166..94788dfd0 100644 --- a/src/ClassiCube.vcxproj.filters +++ b/src/ClassiCube.vcxproj.filters @@ -467,9 +467,6 @@ Source Files\Freetype - - Source Files\Freetype - Source Files\Freetype diff --git a/src/_fttype1.c b/src/_fttype1.c deleted file mode 100644 index 1e8ccee53..000000000 --- a/src/_fttype1.c +++ /dev/null @@ -1,127 +0,0 @@ -/***************************************************************************/ -/* */ -/* fttype1.c */ -/* */ -/* FreeType utility file for PS names support (body). */ -/* */ -/* Copyright 2002-2018 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. */ -/* */ -/***************************************************************************/ - - -#include "freetype/ft2build.h" -#include FT_INTERNAL_DEBUG_H_FT -#include FT_INTERNAL_OBJECTS_H_FT -#include FT_INTERNAL_SERVICE_H_FT -#include FT_SERVICE_POSTSCRIPT_INFO_H_FT - - - /* documentation is in t1tables.h */ - - FT_EXPORT_DEF( FT_Error ) - FT_Get_PS_Font_Info( FT_Face face, - PS_FontInfoRec* afont_info ) - { - FT_Error error; - FT_Service_PsInfo service; - - - if ( !face ) - return FT_THROW( Invalid_Face_Handle ); - - if ( !afont_info ) - return FT_THROW( Invalid_Argument ); - - FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); - - if ( service && service->ps_get_font_info ) - error = service->ps_get_font_info( face, afont_info ); - else - error = FT_THROW( Invalid_Argument ); - - return error; - } - - - /* documentation is in t1tables.h */ - - FT_EXPORT_DEF( FT_Int ) - FT_Has_PS_Glyph_Names( FT_Face face ) - { - FT_Int result = 0; - FT_Service_PsInfo service; - - - if ( face ) - { - FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); - - if ( service && service->ps_has_glyph_names ) - result = service->ps_has_glyph_names( face ); - } - - return result; - } - - - /* documentation is in t1tables.h */ - - FT_EXPORT_DEF( FT_Error ) - FT_Get_PS_Font_Private( FT_Face face, - PS_PrivateRec* afont_private ) - { - FT_Error error; - FT_Service_PsInfo service; - - - if ( !face ) - return FT_THROW( Invalid_Face_Handle ); - - if ( !afont_private ) - return FT_THROW( Invalid_Argument ); - - FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); - - if ( service && service->ps_get_font_private ) - error = service->ps_get_font_private( face, afont_private ); - else - error = FT_THROW( Invalid_Argument ); - - return error; - } - - - /* documentation is in t1tables.h */ - - FT_EXPORT_DEF( FT_Long ) - FT_Get_PS_Font_Value( FT_Face face, - PS_Dict_Keys key, - FT_UInt idx, - void *value, - FT_Long value_len ) - { - FT_Int result = 0; - FT_Service_PsInfo service = NULL; - - - if ( face ) - { - FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); - - if ( service && service->ps_get_font_value ) - result = service->ps_get_font_value( face, key, idx, - value, value_len ); - } - - return result; - } - - -/* END */ diff --git a/src/freetype/cffdrivr.c b/src/freetype/cffdrivr.c index dbe1cf88d..54fa21bda 100644 --- a/src/freetype/cffdrivr.c +++ b/src/freetype/cffdrivr.c @@ -23,7 +23,6 @@ #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_POSTSCRIPT_AUX_H #include FT_INTERNAL_POSTSCRIPT_PROPS_H -#include FT_SERVICE_POSTSCRIPT_INFO_H #include FT_SERVICE_TT_CMAP_H #include FT_SERVICE_CFF_TABLE_LOAD_H @@ -320,75 +319,6 @@ ) - /* - * POSTSCRIPT INFO SERVICE - * - */ - - static FT_Int - cff_ps_has_glyph_names( FT_Face face ) - { - return ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES ) > 0; - } - - - static FT_Error - cff_ps_get_font_info( CFF_Face face, - PS_FontInfoRec* afont_info ) - { - CFF_Font cff = (CFF_Font)face->extra.data; - FT_Error error = FT_Err_Ok; - - - if ( cff && !cff->font_info ) - { - CFF_FontRecDict dict = &cff->top_font.font_dict; - PS_FontInfoRec *font_info = NULL; - FT_Memory memory = face->root.memory; - - - if ( FT_ALLOC( font_info, sizeof ( *font_info ) ) ) - goto Fail; - - font_info->version = cff_index_get_sid_string( cff, - dict->version ); - font_info->notice = cff_index_get_sid_string( cff, - dict->notice ); - font_info->full_name = cff_index_get_sid_string( cff, - dict->full_name ); - font_info->family_name = cff_index_get_sid_string( cff, - dict->family_name ); - font_info->weight = cff_index_get_sid_string( cff, - dict->weight ); - font_info->italic_angle = dict->italic_angle; - font_info->is_fixed_pitch = dict->is_fixed_pitch; - font_info->underline_position = (FT_Short)dict->underline_position; - font_info->underline_thickness = (FT_UShort)dict->underline_thickness; - - cff->font_info = font_info; - } - - if ( cff ) - *afont_info = *cff->font_info; - - Fail: - return error; - } - - - FT_DEFINE_SERVICE_PSINFOREC( - cff_service_ps_info, - - (PS_GetFontInfoFunc) cff_ps_get_font_info, /* ps_get_font_info */ - (PS_GetFontExtraFunc) NULL, /* ps_get_font_extra */ - (PS_HasGlyphNamesFunc) cff_ps_has_glyph_names, /* ps_has_glyph_names */ - /* unsupported with CFF fonts */ - (PS_GetFontPrivateFunc)NULL, /* ps_get_font_private */ - /* not implemented */ - (PS_GetFontValueFunc) NULL /* ps_get_font_value */ - ) - - /* * TT CMAP INFO * @@ -478,22 +408,20 @@ /*************************************************************************/ #if !defined FT_CONFIG_OPTION_NO_GLYPH_NAMES - FT_DEFINE_SERVICEDESCREC6( + FT_DEFINE_SERVICEDESCREC5( cff_services, FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_CFF, - FT_SERVICE_ID_POSTSCRIPT_INFO, &cff_service_ps_info, FT_SERVICE_ID_GLYPH_DICT, &cff_service_glyph_dict, FT_SERVICE_ID_TT_CMAP, &cff_service_get_cmap_info, FT_SERVICE_ID_PROPERTIES, &cff_service_properties, FT_SERVICE_ID_CFF_LOAD, &cff_service_cff_load ) #else - FT_DEFINE_SERVICEDESCREC5( + FT_DEFINE_SERVICEDESCREC4( cff_services, FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_CFF, - FT_SERVICE_ID_POSTSCRIPT_INFO, &cff_service_ps_info, FT_SERVICE_ID_TT_CMAP, &cff_service_get_cmap_info, FT_SERVICE_ID_PROPERTIES, &cff_service_properties, FT_SERVICE_ID_CFF_LOAD, &cff_service_cff_load diff --git a/src/freetype/cidriver.c b/src/freetype/cidriver.c index eda6656cc..80b31dcb5 100644 --- a/src/freetype/cidriver.c +++ b/src/freetype/cidriver.c @@ -25,7 +25,6 @@ #include "ciderrs.h" #include FT_SERVICE_FONT_FORMAT_H -#include FT_SERVICE_POSTSCRIPT_INFO_H #include FT_SERVICE_PROPERTIES_H #include FT_DRIVER_H @@ -42,33 +41,6 @@ #define FT_COMPONENT trace_ciddriver - /* - * POSTSCRIPT INFO SERVICE - * - */ - - static FT_Error - cid_ps_get_font_info( FT_Face face, - PS_FontInfoRec* afont_info ) - { - *afont_info = ((CID_Face)face)->cid.font_info; - - return FT_Err_Ok; - } - - static const FT_Service_PsInfoRec cid_service_ps_info = - { - (PS_GetFontInfoFunc) cid_ps_get_font_info, /* ps_get_font_info */ - (PS_GetFontExtraFunc) NULL, /* ps_get_font_extra */ - /* unsupported with CID fonts */ - (PS_HasGlyphNamesFunc) NULL, /* ps_has_glyph_names */ - /* unsupported */ - (PS_GetFontPrivateFunc)NULL, /* ps_get_font_private */ - /* not implemented */ - (PS_GetFontValueFunc) NULL /* ps_get_font_value */ - }; - - /* * PROPERTY SERVICE * @@ -89,7 +61,6 @@ static const FT_ServiceDescRec cid_services[] = { { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_CID }, - { FT_SERVICE_ID_POSTSCRIPT_INFO, &cid_service_ps_info }, { FT_SERVICE_ID_PROPERTIES, &cid_service_properties }, { NULL, NULL } }; diff --git a/src/freetype/svpsinfo.h b/src/freetype/svpsinfo.h deleted file mode 100644 index 589f573d6..000000000 --- a/src/freetype/svpsinfo.h +++ /dev/null @@ -1,86 +0,0 @@ -/***************************************************************************/ -/* */ -/* svpsinfo.h */ -/* */ -/* The FreeType PostScript info service (specification). */ -/* */ -/* Copyright 2003-2018 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 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_Error - (*PS_GetFontExtraFunc)( FT_Face face, - PS_FontExtraRec* afont_extra ); - - typedef FT_Int - (*PS_HasGlyphNamesFunc)( FT_Face face ); - - typedef FT_Error - (*PS_GetFontPrivateFunc)( FT_Face face, - PS_PrivateRec* afont_private ); - - typedef FT_Long - (*PS_GetFontValueFunc)( FT_Face face, - PS_Dict_Keys key, - FT_UInt idx, - void *value, - FT_Long value_len ); - - - FT_DEFINE_SERVICE( PsInfo ) - { - PS_GetFontInfoFunc ps_get_font_info; - PS_GetFontExtraFunc ps_get_font_extra; - PS_HasGlyphNamesFunc ps_has_glyph_names; - PS_GetFontPrivateFunc ps_get_font_private; - PS_GetFontValueFunc ps_get_font_value; - }; - - -#define FT_DEFINE_SERVICE_PSINFOREC( class_, \ - get_font_info_, \ - ps_get_font_extra_, \ - has_glyph_names_, \ - get_font_private_, \ - get_font_value_ ) \ - static const FT_Service_PsInfoRec class_ = \ - { \ - get_font_info_, ps_get_font_extra_, has_glyph_names_, \ - get_font_private_, get_font_value_ \ - }; - - /* */ - - -FT_END_HEADER - - -#endif /* SVPSINFO_H_ */ - - -/* END */ diff --git a/src/freetype/t1driver.c b/src/freetype/t1driver.c index 2b175fb62..2720f799f 100644 --- a/src/freetype/t1driver.c +++ b/src/freetype/t1driver.c @@ -32,7 +32,6 @@ #include FT_SERVICE_GLYPH_DICT_H #include FT_SERVICE_FONT_FORMAT_H #include FT_SERVICE_POSTSCRIPT_CMAPS_H -#include FT_SERVICE_POSTSCRIPT_INFO_H #include FT_SERVICE_PROPERTIES_H @@ -68,468 +67,6 @@ }; - /* - * POSTSCRIPT INFO SERVICE - * - */ - - static FT_Error - t1_ps_get_font_info( FT_Face face, - PS_FontInfoRec* afont_info ) - { - *afont_info = ((T1_Face)face)->type1.font_info; - - return FT_Err_Ok; - } - - - static FT_Int - t1_ps_has_glyph_names( FT_Face face ) - { - FT_UNUSED( face ); - - return 1; - } - - - static FT_Error - t1_ps_get_font_private( FT_Face face, - PS_PrivateRec* afont_private ) - { - *afont_private = ((T1_Face)face)->type1.private_dict; - - return FT_Err_Ok; - } - - - static FT_Long - t1_ps_get_font_value( FT_Face face, - PS_Dict_Keys key, - FT_UInt idx, - void *value, - FT_Long value_len_ ) - { - FT_ULong retval = 0; /* always >= 1 if valid */ - FT_ULong value_len = value_len_ < 0 ? 0 : (FT_ULong)value_len_; - - T1_Face t1face = (T1_Face)face; - T1_Font type1 = &t1face->type1; - - - switch ( key ) - { - case PS_DICT_FONT_TYPE: - retval = sizeof ( type1->font_type ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->font_type; - break; - - case PS_DICT_FONT_MATRIX: - if ( idx < sizeof ( type1->font_matrix ) / - sizeof ( type1->font_matrix.xx ) ) - { - FT_Fixed val = 0; - - - retval = sizeof ( val ); - if ( value && value_len >= retval ) - { - switch ( idx ) - { - case 0: - val = type1->font_matrix.xx; - break; - case 1: - val = type1->font_matrix.xy; - break; - case 2: - val = type1->font_matrix.yx; - break; - case 3: - val = type1->font_matrix.yy; - break; - } - *((FT_Fixed *)value) = val; - } - } - break; - - case PS_DICT_FONT_BBOX: - if ( idx < sizeof ( type1->font_bbox ) / - sizeof ( type1->font_bbox.xMin ) ) - { - FT_Fixed val = 0; - - - retval = sizeof ( val ); - if ( value && value_len >= retval ) - { - switch ( idx ) - { - case 0: - val = type1->font_bbox.xMin; - break; - case 1: - val = type1->font_bbox.yMin; - break; - case 2: - val = type1->font_bbox.xMax; - break; - case 3: - val = type1->font_bbox.yMax; - break; - } - *((FT_Fixed *)value) = val; - } - } - break; - - case PS_DICT_PAINT_TYPE: - retval = sizeof ( type1->paint_type ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->paint_type; - break; - - case PS_DICT_FONT_NAME: - retval = ft_strlen( type1->font_name ) + 1; - if ( value && value_len >= retval ) - ft_memcpy( value, (void *)( type1->font_name ), retval ); - break; - - case PS_DICT_UNIQUE_ID: - retval = sizeof ( type1->private_dict.unique_id ); - if ( value && value_len >= retval ) - *((FT_Int *)value) = type1->private_dict.unique_id; - break; - - case PS_DICT_NUM_CHAR_STRINGS: - retval = sizeof ( type1->num_glyphs ); - if ( value && value_len >= retval ) - *((FT_Int *)value) = type1->num_glyphs; - break; - - case PS_DICT_CHAR_STRING_KEY: - if ( idx < (FT_UInt)type1->num_glyphs ) - { - retval = ft_strlen( type1->glyph_names[idx] ) + 1; - if ( value && value_len >= retval ) - { - ft_memcpy( value, (void *)( type1->glyph_names[idx] ), retval ); - ((FT_Char *)value)[retval - 1] = (FT_Char)'\0'; - } - } - break; - - case PS_DICT_CHAR_STRING: - if ( idx < (FT_UInt)type1->num_glyphs ) - { - retval = type1->charstrings_len[idx] + 1; - if ( value && value_len >= retval ) - { - ft_memcpy( value, (void *)( type1->charstrings[idx] ), - retval - 1 ); - ((FT_Char *)value)[retval - 1] = (FT_Char)'\0'; - } - } - break; - - case PS_DICT_ENCODING_TYPE: - retval = sizeof ( type1->encoding_type ); - if ( value && value_len >= retval ) - *((T1_EncodingType *)value) = type1->encoding_type; - break; - - case PS_DICT_ENCODING_ENTRY: - if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY && - idx < (FT_UInt)type1->encoding.num_chars ) - { - retval = ft_strlen( type1->encoding.char_name[idx] ) + 1; - if ( value && value_len >= retval ) - { - ft_memcpy( value, (void *)( type1->encoding.char_name[idx] ), - retval - 1 ); - ((FT_Char *)value)[retval - 1] = (FT_Char)'\0'; - } - } - break; - - case PS_DICT_NUM_SUBRS: - retval = sizeof ( type1->num_subrs ); - if ( value && value_len >= retval ) - *((FT_Int *)value) = type1->num_subrs; - break; - - case PS_DICT_SUBR: - { - FT_Bool ok = 0; - - - if ( type1->subrs_hash ) - { - /* convert subr index to array index */ - size_t* val = ft_hash_num_lookup( (FT_Int)idx, - type1->subrs_hash ); - - - if ( val ) - { - idx = *val; - ok = 1; - } - } - else - { - if ( idx < (FT_UInt)type1->num_subrs ) - ok = 1; - } - - if ( ok ) - { - retval = type1->subrs_len[idx] + 1; - if ( value && value_len >= retval ) - { - ft_memcpy( value, (void *)( type1->subrs[idx] ), retval - 1 ); - ((FT_Char *)value)[retval - 1] = (FT_Char)'\0'; - } - } - } - break; - - case PS_DICT_STD_HW: - retval = sizeof ( type1->private_dict.standard_width[0] ); - if ( value && value_len >= retval ) - *((FT_UShort *)value) = type1->private_dict.standard_width[0]; - break; - - case PS_DICT_STD_VW: - retval = sizeof ( type1->private_dict.standard_height[0] ); - if ( value && value_len >= retval ) - *((FT_UShort *)value) = type1->private_dict.standard_height[0]; - break; - - case PS_DICT_NUM_BLUE_VALUES: - retval = sizeof ( type1->private_dict.num_blue_values ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->private_dict.num_blue_values; - break; - - case PS_DICT_BLUE_VALUE: - if ( idx < type1->private_dict.num_blue_values ) - { - retval = sizeof ( type1->private_dict.blue_values[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.blue_values[idx]; - } - break; - - case PS_DICT_BLUE_SCALE: - retval = sizeof ( type1->private_dict.blue_scale ); - if ( value && value_len >= retval ) - *((FT_Fixed *)value) = type1->private_dict.blue_scale; - break; - - case PS_DICT_BLUE_FUZZ: - retval = sizeof ( type1->private_dict.blue_fuzz ); - if ( value && value_len >= retval ) - *((FT_Int *)value) = type1->private_dict.blue_fuzz; - break; - - case PS_DICT_BLUE_SHIFT: - retval = sizeof ( type1->private_dict.blue_shift ); - if ( value && value_len >= retval ) - *((FT_Int *)value) = type1->private_dict.blue_shift; - break; - - case PS_DICT_NUM_OTHER_BLUES: - retval = sizeof ( type1->private_dict.num_other_blues ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->private_dict.num_other_blues; - break; - - case PS_DICT_OTHER_BLUE: - if ( idx < type1->private_dict.num_other_blues ) - { - retval = sizeof ( type1->private_dict.other_blues[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.other_blues[idx]; - } - break; - - case PS_DICT_NUM_FAMILY_BLUES: - retval = sizeof ( type1->private_dict.num_family_blues ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->private_dict.num_family_blues; - break; - - case PS_DICT_FAMILY_BLUE: - if ( idx < type1->private_dict.num_family_blues ) - { - retval = sizeof ( type1->private_dict.family_blues[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.family_blues[idx]; - } - break; - - case PS_DICT_NUM_FAMILY_OTHER_BLUES: - retval = sizeof ( type1->private_dict.num_family_other_blues ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->private_dict.num_family_other_blues; - break; - - case PS_DICT_FAMILY_OTHER_BLUE: - if ( idx < type1->private_dict.num_family_other_blues ) - { - retval = sizeof ( type1->private_dict.family_other_blues[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.family_other_blues[idx]; - } - break; - - case PS_DICT_NUM_STEM_SNAP_H: - retval = sizeof ( type1->private_dict.num_snap_widths ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->private_dict.num_snap_widths; - break; - - case PS_DICT_STEM_SNAP_H: - if ( idx < type1->private_dict.num_snap_widths ) - { - retval = sizeof ( type1->private_dict.snap_widths[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.snap_widths[idx]; - } - break; - - case PS_DICT_NUM_STEM_SNAP_V: - retval = sizeof ( type1->private_dict.num_snap_heights ); - if ( value && value_len >= retval ) - *((FT_Byte *)value) = type1->private_dict.num_snap_heights; - break; - - case PS_DICT_STEM_SNAP_V: - if ( idx < type1->private_dict.num_snap_heights ) - { - retval = sizeof ( type1->private_dict.snap_heights[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.snap_heights[idx]; - } - break; - - case PS_DICT_RND_STEM_UP: - retval = sizeof ( type1->private_dict.round_stem_up ); - if ( value && value_len >= retval ) - *((FT_Bool *)value) = type1->private_dict.round_stem_up; - break; - - case PS_DICT_FORCE_BOLD: - retval = sizeof ( type1->private_dict.force_bold ); - if ( value && value_len >= retval ) - *((FT_Bool *)value) = type1->private_dict.force_bold; - break; - - case PS_DICT_MIN_FEATURE: - if ( idx < sizeof ( type1->private_dict.min_feature ) / - sizeof ( type1->private_dict.min_feature[0] ) ) - { - retval = sizeof ( type1->private_dict.min_feature[idx] ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->private_dict.min_feature[idx]; - } - break; - - case PS_DICT_LEN_IV: - retval = sizeof ( type1->private_dict.lenIV ); - if ( value && value_len >= retval ) - *((FT_Int *)value) = type1->private_dict.lenIV; - break; - - case PS_DICT_PASSWORD: - retval = sizeof ( type1->private_dict.password ); - if ( value && value_len >= retval ) - *((FT_Long *)value) = type1->private_dict.password; - break; - - case PS_DICT_LANGUAGE_GROUP: - retval = sizeof ( type1->private_dict.language_group ); - if ( value && value_len >= retval ) - *((FT_Long *)value) = type1->private_dict.language_group; - break; - - case PS_DICT_IS_FIXED_PITCH: - retval = sizeof ( type1->font_info.is_fixed_pitch ); - if ( value && value_len >= retval ) - *((FT_Bool *)value) = type1->font_info.is_fixed_pitch; - break; - - case PS_DICT_UNDERLINE_POSITION: - retval = sizeof ( type1->font_info.underline_position ); - if ( value && value_len >= retval ) - *((FT_Short *)value) = type1->font_info.underline_position; - break; - - case PS_DICT_UNDERLINE_THICKNESS: - retval = sizeof ( type1->font_info.underline_thickness ); - if ( value && value_len >= retval ) - *((FT_UShort *)value) = type1->font_info.underline_thickness; - break; - - case PS_DICT_FS_TYPE: - retval = sizeof ( type1->font_extra.fs_type ); - if ( value && value_len >= retval ) - *((FT_UShort *)value) = type1->font_extra.fs_type; - break; - - case PS_DICT_VERSION: - retval = ft_strlen( type1->font_info.version ) + 1; - if ( value && value_len >= retval ) - ft_memcpy( value, (void *)( type1->font_info.version ), retval ); - break; - - case PS_DICT_NOTICE: - retval = ft_strlen( type1->font_info.notice ) + 1; - if ( value && value_len >= retval ) - ft_memcpy( value, (void *)( type1->font_info.notice ), retval ); - break; - - case PS_DICT_FULL_NAME: - retval = ft_strlen( type1->font_info.full_name ) + 1; - if ( value && value_len >= retval ) - ft_memcpy( value, (void *)( type1->font_info.full_name ), retval ); - break; - - case PS_DICT_FAMILY_NAME: - retval = ft_strlen( type1->font_info.family_name ) + 1; - if ( value && value_len >= retval ) - ft_memcpy( value, (void *)( type1->font_info.family_name ), retval ); - break; - - case PS_DICT_WEIGHT: - retval = ft_strlen( type1->font_info.weight ) + 1; - if ( value && value_len >= retval ) - ft_memcpy( value, (void *)( type1->font_info.weight ), retval ); - break; - - case PS_DICT_ITALIC_ANGLE: - retval = sizeof ( type1->font_info.italic_angle ); - if ( value && value_len >= retval ) - *((FT_Long *)value) = type1->font_info.italic_angle; - break; - } - - return retval == 0 ? -1 : (FT_Long)retval; - } - - - static const FT_Service_PsInfoRec t1_service_ps_info = - { - (PS_GetFontInfoFunc) t1_ps_get_font_info, /* ps_get_font_info */ - (PS_GetFontExtraFunc) NULL, /* ps_get_font_extra */ - (PS_HasGlyphNamesFunc) t1_ps_has_glyph_names, /* ps_has_glyph_names */ - (PS_GetFontPrivateFunc)t1_ps_get_font_private, /* ps_get_font_private */ - (PS_GetFontValueFunc) t1_ps_get_font_value, /* ps_get_font_value */ - }; - - /* * PROPERTY SERVICE * @@ -551,7 +88,6 @@ { { FT_SERVICE_ID_GLYPH_DICT, &t1_service_glyph_dict }, { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_TYPE_1 }, - { FT_SERVICE_ID_POSTSCRIPT_INFO, &t1_service_ps_info }, { FT_SERVICE_ID_PROPERTIES, &t1_service_properties }, { NULL, NULL } }; diff --git a/src/freetype/t1tables.h b/src/freetype/t1tables.h index ff8520d19..ea33f9d86 100644 --- a/src/freetype/t1tables.h +++ b/src/freetype/t1tables.h @@ -54,11 +54,6 @@ FT_BEGIN_HEADER /* CID_FaceInfoRec */ /* CID_FaceInfo */ /* */ - /* FT_Has_PS_Glyph_Names */ - /* FT_Get_PS_Font_Info */ - /* FT_Get_PS_Font_Private */ - /* FT_Get_PS_Font_Value */ - /* */ /* T1_Blend_Flags */ /* T1_EncodingType */ /* PS_Dict_Keys */ @@ -244,25 +239,6 @@ FT_BEGIN_HEADER } T1_Blend_Flags; - - /* these constants are deprecated; use the corresponding */ - /* `T1_Blend_Flags' values instead */ -#define t1_blend_underline_position T1_BLEND_UNDERLINE_POSITION -#define t1_blend_underline_thickness T1_BLEND_UNDERLINE_THICKNESS -#define t1_blend_italic_angle T1_BLEND_ITALIC_ANGLE -#define t1_blend_blue_values T1_BLEND_BLUE_VALUES -#define t1_blend_other_blues T1_BLEND_OTHER_BLUES -#define t1_blend_standard_widths T1_BLEND_STANDARD_WIDTH -#define t1_blend_standard_height T1_BLEND_STANDARD_HEIGHT -#define t1_blend_stem_snap_widths T1_BLEND_STEM_SNAP_WIDTHS -#define t1_blend_stem_snap_heights T1_BLEND_STEM_SNAP_HEIGHTS -#define t1_blend_blue_scale T1_BLEND_BLUE_SCALE -#define t1_blend_blue_shift T1_BLEND_BLUE_SHIFT -#define t1_blend_family_blues T1_BLEND_FAMILY_BLUES -#define t1_blend_family_other_blues T1_BLEND_FAMILY_OTHER_BLUES -#define t1_blend_force_bold T1_BLEND_FORCE_BOLD -#define t1_blend_max T1_BLEND_MAX - /* */ @@ -439,99 +415,6 @@ FT_BEGIN_HEADER typedef CID_FaceInfoRec CID_Info; - /************************************************************************ - * - * @function: - * FT_Has_PS_Glyph_Names - * - * @description: - * Return true if a given face provides reliable PostScript glyph - * names. This is similar to using the @FT_HAS_GLYPH_NAMES macro, - * except that certain fonts (mostly TrueType) contain incorrect - * glyph name tables. - * - * When this function returns true, the caller is sure that the glyph - * names returned by @FT_Get_Glyph_Name are reliable. - * - * @input: - * face :: - * face handle - * - * @return: - * Boolean. True if glyph names are reliable. - * - */ - FT_EXPORT( FT_Int ) - FT_Has_PS_Glyph_Names( FT_Face face ); - - - /************************************************************************ - * - * @function: - * FT_Get_PS_Font_Info - * - * @description: - * Retrieve the @PS_FontInfoRec structure corresponding to a given - * PostScript font. - * - * @input: - * face :: - * PostScript face handle. - * - * @output: - * afont_info :: - * Output font info structure pointer. - * - * @return: - * FreeType error code. 0~means success. - * - * @note: - * String pointers within the @PS_FontInfoRec structure are owned by - * the face and don't need to be freed by the caller. Missing entries - * in the font's FontInfo dictionary are represented by NULL pointers. - * - * If the font's format is not PostScript-based, this function will - * return the `FT_Err_Invalid_Argument' error code. - * - */ - FT_EXPORT( FT_Error ) - FT_Get_PS_Font_Info( FT_Face face, - PS_FontInfo afont_info ); - - - /************************************************************************ - * - * @function: - * FT_Get_PS_Font_Private - * - * @description: - * Retrieve the @PS_PrivateRec structure corresponding to a given - * PostScript font. - * - * @input: - * face :: - * PostScript face handle. - * - * @output: - * afont_private :: - * Output private dictionary structure pointer. - * - * @return: - * FreeType error code. 0~means success. - * - * @note: - * The string pointers within the @PS_PrivateRec structure are owned by - * the face and don't need to be freed by the caller. - * - * If the font's format is not PostScript-based, this function returns - * the `FT_Err_Invalid_Argument' error code. - * - */ - FT_EXPORT( FT_Error ) - FT_Get_PS_Font_Private( FT_Face face, - PS_Private afont_private ); - - /*************************************************************************/ /* */ /* */ @@ -561,199 +444,6 @@ FT_BEGIN_HEADER } T1_EncodingType; - - /*************************************************************************/ - /* */ - /* */ - /* PS_Dict_Keys */ - /* */ - /* */ - /* An enumeration used in calls to @FT_Get_PS_Font_Value to identify */ - /* the Type~1 dictionary entry to retrieve. */ - /* */ - /* */ - /* PS_DICT_FONT_TYPE :: */ - /* PS_DICT_FONT_MATRIX :: */ - /* PS_DICT_FONT_BBOX :: */ - /* PS_DICT_PAINT_TYPE :: */ - /* PS_DICT_FONT_NAME :: */ - /* PS_DICT_UNIQUE_ID :: */ - /* PS_DICT_NUM_CHAR_STRINGS :: */ - /* PS_DICT_CHAR_STRING_KEY :: */ - /* PS_DICT_CHAR_STRING :: */ - /* PS_DICT_ENCODING_TYPE :: */ - /* PS_DICT_ENCODING_ENTRY :: */ - /* PS_DICT_NUM_SUBRS :: */ - /* PS_DICT_SUBR :: */ - /* PS_DICT_STD_HW :: */ - /* PS_DICT_STD_VW :: */ - /* PS_DICT_NUM_BLUE_VALUES :: */ - /* PS_DICT_BLUE_VALUE :: */ - /* PS_DICT_BLUE_FUZZ :: */ - /* PS_DICT_NUM_OTHER_BLUES :: */ - /* PS_DICT_OTHER_BLUE :: */ - /* PS_DICT_NUM_FAMILY_BLUES :: */ - /* PS_DICT_FAMILY_BLUE :: */ - /* PS_DICT_NUM_FAMILY_OTHER_BLUES :: */ - /* PS_DICT_FAMILY_OTHER_BLUE :: */ - /* PS_DICT_BLUE_SCALE :: */ - /* PS_DICT_BLUE_SHIFT :: */ - /* PS_DICT_NUM_STEM_SNAP_H :: */ - /* PS_DICT_STEM_SNAP_H :: */ - /* PS_DICT_NUM_STEM_SNAP_V :: */ - /* PS_DICT_STEM_SNAP_V :: */ - /* PS_DICT_FORCE_BOLD :: */ - /* PS_DICT_RND_STEM_UP :: */ - /* PS_DICT_MIN_FEATURE :: */ - /* PS_DICT_LEN_IV :: */ - /* PS_DICT_PASSWORD :: */ - /* PS_DICT_LANGUAGE_GROUP :: */ - /* PS_DICT_VERSION :: */ - /* PS_DICT_NOTICE :: */ - /* PS_DICT_FULL_NAME :: */ - /* PS_DICT_FAMILY_NAME :: */ - /* PS_DICT_WEIGHT :: */ - /* PS_DICT_IS_FIXED_PITCH :: */ - /* PS_DICT_UNDERLINE_POSITION :: */ - /* PS_DICT_UNDERLINE_THICKNESS :: */ - /* PS_DICT_FS_TYPE :: */ - /* PS_DICT_ITALIC_ANGLE :: */ - /* */ - /* */ - /* 2.4.8 */ - /* */ - typedef enum PS_Dict_Keys_ - { - /* conventionally in the font dictionary */ - PS_DICT_FONT_TYPE, /* FT_Byte */ - PS_DICT_FONT_MATRIX, /* FT_Fixed */ - PS_DICT_FONT_BBOX, /* FT_Fixed */ - PS_DICT_PAINT_TYPE, /* FT_Byte */ - PS_DICT_FONT_NAME, /* FT_String* */ - PS_DICT_UNIQUE_ID, /* FT_Int */ - PS_DICT_NUM_CHAR_STRINGS, /* FT_Int */ - PS_DICT_CHAR_STRING_KEY, /* FT_String* */ - PS_DICT_CHAR_STRING, /* FT_String* */ - PS_DICT_ENCODING_TYPE, /* T1_EncodingType */ - PS_DICT_ENCODING_ENTRY, /* FT_String* */ - - /* conventionally in the font Private dictionary */ - PS_DICT_NUM_SUBRS, /* FT_Int */ - PS_DICT_SUBR, /* FT_String* */ - PS_DICT_STD_HW, /* FT_UShort */ - PS_DICT_STD_VW, /* FT_UShort */ - PS_DICT_NUM_BLUE_VALUES, /* FT_Byte */ - PS_DICT_BLUE_VALUE, /* FT_Short */ - PS_DICT_BLUE_FUZZ, /* FT_Int */ - PS_DICT_NUM_OTHER_BLUES, /* FT_Byte */ - PS_DICT_OTHER_BLUE, /* FT_Short */ - PS_DICT_NUM_FAMILY_BLUES, /* FT_Byte */ - PS_DICT_FAMILY_BLUE, /* FT_Short */ - PS_DICT_NUM_FAMILY_OTHER_BLUES, /* FT_Byte */ - PS_DICT_FAMILY_OTHER_BLUE, /* FT_Short */ - PS_DICT_BLUE_SCALE, /* FT_Fixed */ - PS_DICT_BLUE_SHIFT, /* FT_Int */ - PS_DICT_NUM_STEM_SNAP_H, /* FT_Byte */ - PS_DICT_STEM_SNAP_H, /* FT_Short */ - PS_DICT_NUM_STEM_SNAP_V, /* FT_Byte */ - PS_DICT_STEM_SNAP_V, /* FT_Short */ - PS_DICT_FORCE_BOLD, /* FT_Bool */ - PS_DICT_RND_STEM_UP, /* FT_Bool */ - PS_DICT_MIN_FEATURE, /* FT_Short */ - PS_DICT_LEN_IV, /* FT_Int */ - PS_DICT_PASSWORD, /* FT_Long */ - PS_DICT_LANGUAGE_GROUP, /* FT_Long */ - - /* conventionally in the font FontInfo dictionary */ - PS_DICT_VERSION, /* FT_String* */ - PS_DICT_NOTICE, /* FT_String* */ - PS_DICT_FULL_NAME, /* FT_String* */ - PS_DICT_FAMILY_NAME, /* FT_String* */ - PS_DICT_WEIGHT, /* FT_String* */ - PS_DICT_IS_FIXED_PITCH, /* FT_Bool */ - PS_DICT_UNDERLINE_POSITION, /* FT_Short */ - PS_DICT_UNDERLINE_THICKNESS, /* FT_UShort */ - PS_DICT_FS_TYPE, /* FT_UShort */ - PS_DICT_ITALIC_ANGLE, /* FT_Long */ - - PS_DICT_MAX = PS_DICT_ITALIC_ANGLE - - } PS_Dict_Keys; - - - /************************************************************************ - * - * @function: - * FT_Get_PS_Font_Value - * - * @description: - * Retrieve the value for the supplied key from a PostScript font. - * - * @input: - * face :: - * PostScript face handle. - * - * key :: - * An enumeration value representing the dictionary key to retrieve. - * - * idx :: - * For array values, this specifies the index to be returned. - * - * value :: - * A pointer to memory into which to write the value. - * - * valen_len :: - * The size, in bytes, of the memory supplied for the value. - * - * @output: - * value :: - * The value matching the above key, if it exists. - * - * @return: - * The amount of memory (in bytes) required to hold the requested - * value (if it exists, -1 otherwise). - * - * @note: - * The values returned are not pointers into the internal structures of - * the face, but are `fresh' copies, so that the memory containing them - * belongs to the calling application. This also enforces the - * `read-only' nature of these values, i.e., this function cannot be - * used to manipulate the face. - * - * `value' is a void pointer because the values returned can be of - * various types. - * - * If either `value' is NULL or `value_len' is too small, just the - * required memory size for the requested entry is returned. - * - * The `idx' parameter is used, not only to retrieve elements of, for - * example, the FontMatrix or FontBBox, but also to retrieve name keys - * from the CharStrings dictionary, and the charstrings themselves. It - * is ignored for atomic values. - * - * PS_DICT_BLUE_SCALE returns a value that is scaled up by 1000. To - * get the value as in the font stream, you need to divide by - * 65536000.0 (to remove the FT_Fixed scale, and the x1000 scale). - * - * IMPORTANT: Only key/value pairs read by the FreeType interpreter can - * be retrieved. So, for example, PostScript procedures such as NP, - * ND, and RD are not available. Arbitrary keys are, obviously, not be - * available either. - * - * If the font's format is not PostScript-based, this function returns - * the `FT_Err_Invalid_Argument' error code. - * - * @since: - * 2.4.8 - * - */ - FT_EXPORT( FT_Long ) - FT_Get_PS_Font_Value( FT_Face face, - PS_Dict_Keys key, - FT_UInt idx, - void *value, - FT_Long value_len ); - /* */ FT_END_HEADER