diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-05-02 20:27:48 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-05-02 20:27:48 +0200 |
| commit | 9514959241dec9943a99cd1c8f0c214a5fbb0d91 (patch) | |
| tree | 93a63ae4ece234ce9019d8a39cc836c180144f6a /src/cff/cffobjs.c | |
| parent | 86bc8a95056c97a810986434a3f268cbe67f2902 (diff) | |
| download | freetype2-9514959241dec9943a99cd1c8f0c214a5fbb0d91.tar.gz | |
Remove FT_CONFIG_OPTION_PIC and related code.
*/* [FT_CONFIG_OPTION_PIC]: Remove all code guarded by this
preprocessor symbol.
*/*: Replace `XXX_GET' macros (which could be either a function in
PIC mode or an array in non-PIC mode) with `xxx' arrays.
* include/freetype/internal/ftpic.h, src/autofit/afpic.c,
src/autofit/afpic.h, src/base/basepic.c, src/base/basepic.h,
src/base/ftpic.c, src/cff/cffpic.c, src/cff/cffpic.h,
src/pshinter/pshpic.c, src/pshinter/pshpic.h, src/psnames/pspic.c,
src/psnames/pspic.h, src/raster/rastpic.c, src/raster/rastpic.h,
src/sfnt/sfntpic.c, src/sfnt/sfntpic.h, src/smooth/ftspic.c,
src/smooth/ftspic.h, src/truetype/ttpic.c, src/truetype/ttpic.h:
Removed.
Diffstat (limited to 'src/cff/cffobjs.c')
| -rw-r--r-- | src/cff/cffobjs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index a2d7aec65..61b736ca2 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -37,7 +37,6 @@ #include "cffobjs.h" #include "cffload.h" #include "cffcmap.h" -#include "cffpic.h" #include "cfferrs.h" @@ -1070,7 +1069,7 @@ nn = (FT_UInt)cffface->num_charmaps; - error = FT_CMap_New( &CFF_CMAP_UNICODE_CLASS_REC_GET, NULL, + error = FT_CMap_New( &cff_cmap_unicode_class_rec, NULL, &cmaprec, NULL ); if ( error && FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) ) @@ -1094,19 +1093,19 @@ { cmaprec.encoding_id = TT_ADOBE_ID_STANDARD; cmaprec.encoding = FT_ENCODING_ADOBE_STANDARD; - clazz = &CFF_CMAP_ENCODING_CLASS_REC_GET; + clazz = &cff_cmap_encoding_class_rec; } else if ( encoding->offset == 1 ) { cmaprec.encoding_id = TT_ADOBE_ID_EXPERT; cmaprec.encoding = FT_ENCODING_ADOBE_EXPERT; - clazz = &CFF_CMAP_ENCODING_CLASS_REC_GET; + clazz = &cff_cmap_encoding_class_rec; } else { cmaprec.encoding_id = TT_ADOBE_ID_CUSTOM; cmaprec.encoding = FT_ENCODING_ADOBE_CUSTOM; - clazz = &CFF_CMAP_ENCODING_CLASS_REC_GET; + clazz = &cff_cmap_encoding_class_rec; } error = FT_CMap_New( clazz, NULL, &cmaprec, NULL ); |