2018-06-03 09:01:17 +02:00
|
|
|
/****************************************************************************
|
|
|
|
*
|
|
|
|
* psintrp.c
|
|
|
|
*
|
|
|
|
* Adobe's CFF Interpreter (body).
|
|
|
|
*
|
|
|
|
* Copyright 2007-2014 Adobe Systems Incorporated.
|
|
|
|
*
|
|
|
|
* This software, and all works of authorship, whether in source or
|
|
|
|
* object code form as indicated by the copyright notice(s) included
|
|
|
|
* herein (collectively, the "Work") is made available, and may only be
|
|
|
|
* used, modified, and distributed under the FreeType Project License,
|
|
|
|
* LICENSE.TXT. Additionally, subject to the terms and conditions of the
|
|
|
|
* FreeType Project License, each contributor to the Work hereby grants
|
|
|
|
* to any individual or legal entity exercising permissions granted by
|
|
|
|
* the FreeType Project License and this section (hereafter, "You" or
|
|
|
|
* "Your") a perpetual, worldwide, non-exclusive, no-charge,
|
|
|
|
* royalty-free, irrevocable (except as stated in this section) patent
|
|
|
|
* license to make, have made, use, offer to sell, sell, import, and
|
|
|
|
* otherwise transfer the Work, where such license applies only to those
|
|
|
|
* patent claims licensable by such contributor that are necessarily
|
|
|
|
* infringed by their contribution(s) alone or by combination of their
|
|
|
|
* contribution(s) with the Work to which such contribution(s) was
|
|
|
|
* submitted. If You institute patent litigation against any entity
|
|
|
|
* (including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
|
|
* the Work or a contribution incorporated within the Work constitutes
|
|
|
|
* direct or contributory patent infringement, then any patent licenses
|
|
|
|
* granted to You under this License for that Work shall terminate as of
|
|
|
|
* the date such litigation is filed.
|
|
|
|
*
|
|
|
|
* By using, modifying, or distributing the Work you indicate that you
|
|
|
|
* have read and understood the terms and conditions of the
|
|
|
|
* FreeType Project License as well as those provided in this section,
|
|
|
|
* and you accept them fully.
|
|
|
|
*
|
|
|
|
*/
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
2017-09-24 22:40:07 +02:00
|
|
|
#include "psft.h"
|
2020-06-08 13:31:55 +02:00
|
|
|
#include <freetype/internal/ftdebug.h>
|
|
|
|
#include <freetype/internal/services/svcfftl.h>
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-24 22:40:07 +02:00
|
|
|
#include "psglue.h"
|
|
|
|
#include "psfont.h"
|
|
|
|
#include "psstack.h"
|
|
|
|
#include "pshints.h"
|
|
|
|
#include "psintrp.h"
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-24 22:40:07 +02:00
|
|
|
#include "pserror.h"
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 08:04:09 +02:00
|
|
|
#include "psobjs.h" /* for cff_random */
|
2017-10-01 01:39:27 +02:00
|
|
|
#include "t1decode.h" /* for t1 seac */
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2018-06-03 09:01:17 +02:00
|
|
|
/**************************************************************************
|
|
|
|
*
|
|
|
|
* The macro FT_COMPONENT is used in trace mode. It is an implicit
|
|
|
|
* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log
|
|
|
|
* messages during execution.
|
|
|
|
*/
|
2013-04-13 15:02:31 +02:00
|
|
|
#undef FT_COMPONENT
|
2018-08-15 18:13:17 +02:00
|
|
|
#define FT_COMPONENT cf2interp
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
cf2_hintmask_init( CF2_HintMask hintmask,
|
|
|
|
FT_Error* error )
|
|
|
|
{
|
|
|
|
FT_ZERO( hintmask );
|
|
|
|
|
|
|
|
hintmask->error = error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Bool )
|
|
|
|
cf2_hintmask_isValid( const CF2_HintMask hintmask )
|
|
|
|
{
|
|
|
|
return hintmask->isValid;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Bool )
|
|
|
|
cf2_hintmask_isNew( const CF2_HintMask hintmask )
|
|
|
|
{
|
|
|
|
return hintmask->isNew;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
cf2_hintmask_setNew( CF2_HintMask hintmask,
|
|
|
|
FT_Bool val )
|
|
|
|
{
|
|
|
|
hintmask->isNew = val;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* clients call `getMaskPtr' in order to iterate */
|
|
|
|
/* through hint mask */
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Byte* )
|
|
|
|
cf2_hintmask_getMaskPtr( CF2_HintMask hintmask )
|
|
|
|
{
|
|
|
|
return hintmask->mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
cf2_hintmask_setCounts( CF2_HintMask hintmask,
|
|
|
|
size_t bitCount )
|
|
|
|
{
|
|
|
|
if ( bitCount > CF2_MAX_HINTS )
|
|
|
|
{
|
|
|
|
/* total of h and v stems must be <= 96 */
|
|
|
|
CF2_SET_ERROR( hintmask->error, Invalid_Glyph_Format );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
hintmask->bitCount = bitCount;
|
|
|
|
hintmask->byteCount = ( hintmask->bitCount + 7 ) / 8;
|
|
|
|
|
|
|
|
hintmask->isValid = TRUE;
|
|
|
|
hintmask->isNew = TRUE;
|
|
|
|
|
|
|
|
return bitCount;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* consume the hintmask bytes from the charstring, advancing the src */
|
|
|
|
/* pointer */
|
|
|
|
static void
|
|
|
|
cf2_hintmask_read( CF2_HintMask hintmask,
|
|
|
|
CF2_Buffer charstring,
|
|
|
|
size_t bitCount )
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
#ifndef CF2_NDEBUG
|
|
|
|
/* these are the bits in the final mask byte that should be zero */
|
|
|
|
/* Note: this variable is only used in an assert expression below */
|
|
|
|
/* and then only if CF2_NDEBUG is not defined */
|
|
|
|
CF2_UInt mask = ( 1 << ( -(CF2_Int)bitCount & 7 ) ) - 1;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* initialize counts and isValid */
|
|
|
|
if ( cf2_hintmask_setCounts( hintmask, bitCount ) == 0 )
|
|
|
|
return;
|
|
|
|
|
|
|
|
FT_ASSERT( hintmask->byteCount > 0 );
|
|
|
|
|
|
|
|
FT_TRACE4(( " (maskbytes:" ));
|
|
|
|
|
|
|
|
/* set mask and advance interpreter's charstring pointer */
|
|
|
|
for ( i = 0; i < hintmask->byteCount; i++ )
|
|
|
|
{
|
|
|
|
hintmask->mask[i] = (FT_Byte)cf2_buf_readByte( charstring );
|
|
|
|
FT_TRACE4(( " 0x%02X", hintmask->mask[i] ));
|
|
|
|
}
|
|
|
|
|
|
|
|
FT_TRACE4(( ")\n" ));
|
|
|
|
|
|
|
|
/* assert any unused bits in last byte are zero unless there's a prior */
|
|
|
|
/* error */
|
|
|
|
/* bitCount -> mask, 0 -> 0, 1 -> 7f, 2 -> 3f, ... 6 -> 3, 7 -> 1 */
|
|
|
|
#ifndef CF2_NDEBUG
|
|
|
|
FT_ASSERT( ( hintmask->mask[hintmask->byteCount - 1] & mask ) == 0 ||
|
|
|
|
*hintmask->error );
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
cf2_hintmask_setAll( CF2_HintMask hintmask,
|
|
|
|
size_t bitCount )
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
CF2_UInt mask = ( 1 << ( -(CF2_Int)bitCount & 7 ) ) - 1;
|
|
|
|
|
|
|
|
|
|
|
|
/* initialize counts and isValid */
|
|
|
|
if ( cf2_hintmask_setCounts( hintmask, bitCount ) == 0 )
|
|
|
|
return;
|
|
|
|
|
|
|
|
FT_ASSERT( hintmask->byteCount > 0 );
|
2015-10-21 14:07:25 +02:00
|
|
|
FT_ASSERT( hintmask->byteCount <=
|
2013-04-13 15:02:31 +02:00
|
|
|
sizeof ( hintmask->mask ) / sizeof ( hintmask->mask[0] ) );
|
|
|
|
|
|
|
|
/* set mask to all ones */
|
|
|
|
for ( i = 0; i < hintmask->byteCount; i++ )
|
|
|
|
hintmask->mask[i] = 0xFF;
|
|
|
|
|
|
|
|
/* clear unused bits */
|
|
|
|
/* bitCount -> mask, 0 -> 0, 1 -> 7f, 2 -> 3f, ... 6 -> 3, 7 -> 1 */
|
|
|
|
hintmask->mask[hintmask->byteCount - 1] &= ~mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Type2 charstring opcodes */
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
cf2_cmdRESERVED_0, /* 0 */
|
|
|
|
cf2_cmdHSTEM, /* 1 */
|
|
|
|
cf2_cmdRESERVED_2, /* 2 */
|
|
|
|
cf2_cmdVSTEM, /* 3 */
|
|
|
|
cf2_cmdVMOVETO, /* 4 */
|
|
|
|
cf2_cmdRLINETO, /* 5 */
|
|
|
|
cf2_cmdHLINETO, /* 6 */
|
|
|
|
cf2_cmdVLINETO, /* 7 */
|
|
|
|
cf2_cmdRRCURVETO, /* 8 */
|
2017-09-25 06:59:26 +02:00
|
|
|
cf2_cmdCLOSEPATH, /* 9 T1 only */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_cmdCALLSUBR, /* 10 */
|
|
|
|
cf2_cmdRETURN, /* 11 */
|
|
|
|
cf2_cmdESC, /* 12 */
|
2017-09-25 06:59:26 +02:00
|
|
|
cf2_cmdHSBW, /* 13 T1 only */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_cmdENDCHAR, /* 14 */
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
cf2_cmdVSINDEX, /* 15 */
|
|
|
|
cf2_cmdBLEND, /* 16 */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_cmdRESERVED_17, /* 17 */
|
|
|
|
cf2_cmdHSTEMHM, /* 18 */
|
|
|
|
cf2_cmdHINTMASK, /* 19 */
|
|
|
|
cf2_cmdCNTRMASK, /* 20 */
|
|
|
|
cf2_cmdRMOVETO, /* 21 */
|
|
|
|
cf2_cmdHMOVETO, /* 22 */
|
|
|
|
cf2_cmdVSTEMHM, /* 23 */
|
|
|
|
cf2_cmdRCURVELINE, /* 24 */
|
|
|
|
cf2_cmdRLINECURVE, /* 25 */
|
|
|
|
cf2_cmdVVCURVETO, /* 26 */
|
|
|
|
cf2_cmdHHCURVETO, /* 27 */
|
|
|
|
cf2_cmdEXTENDEDNMBR, /* 28 */
|
|
|
|
cf2_cmdCALLGSUBR, /* 29 */
|
|
|
|
cf2_cmdVHCURVETO, /* 30 */
|
|
|
|
cf2_cmdHVCURVETO /* 31 */
|
|
|
|
};
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
cf2_escDOTSECTION, /* 0 */
|
2017-09-25 06:59:26 +02:00
|
|
|
cf2_escVSTEM3, /* 1 T1 only */
|
|
|
|
cf2_escHSTEM3, /* 2 T1 only */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_escAND, /* 3 */
|
|
|
|
cf2_escOR, /* 4 */
|
|
|
|
cf2_escNOT, /* 5 */
|
2017-09-25 06:59:26 +02:00
|
|
|
cf2_escSEAC, /* 6 T1 only */
|
|
|
|
cf2_escSBW, /* 7 T1 only */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_escRESERVED_8, /* 8 */
|
|
|
|
cf2_escABS, /* 9 */
|
|
|
|
cf2_escADD, /* 10 like otherADD */
|
|
|
|
cf2_escSUB, /* 11 like otherSUB */
|
|
|
|
cf2_escDIV, /* 12 */
|
|
|
|
cf2_escRESERVED_13, /* 13 */
|
|
|
|
cf2_escNEG, /* 14 */
|
|
|
|
cf2_escEQ, /* 15 */
|
2017-09-25 06:59:26 +02:00
|
|
|
cf2_escCALLOTHERSUBR,/* 16 T1 only */
|
|
|
|
cf2_escPOP, /* 17 T1 only */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_escDROP, /* 18 */
|
|
|
|
cf2_escRESERVED_19, /* 19 */
|
|
|
|
cf2_escPUT, /* 20 like otherPUT */
|
|
|
|
cf2_escGET, /* 21 like otherGET */
|
|
|
|
cf2_escIFELSE, /* 22 like otherIFELSE */
|
|
|
|
cf2_escRANDOM, /* 23 like otherRANDOM */
|
|
|
|
cf2_escMUL, /* 24 like otherMUL */
|
|
|
|
cf2_escRESERVED_25, /* 25 */
|
|
|
|
cf2_escSQRT, /* 26 */
|
|
|
|
cf2_escDUP, /* 27 like otherDUP */
|
|
|
|
cf2_escEXCH, /* 28 like otherEXCH */
|
|
|
|
cf2_escINDEX, /* 29 */
|
|
|
|
cf2_escROLL, /* 30 */
|
|
|
|
cf2_escRESERVED_31, /* 31 */
|
|
|
|
cf2_escRESERVED_32, /* 32 */
|
2017-09-25 06:59:26 +02:00
|
|
|
cf2_escSETCURRENTPT, /* 33 T1 only */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_escHFLEX, /* 34 */
|
|
|
|
cf2_escFLEX, /* 35 */
|
|
|
|
cf2_escHFLEX1, /* 36 */
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_escFLEX1, /* 37 */
|
|
|
|
cf2_escRESERVED_38 /* 38 & all higher */
|
2013-04-13 15:02:31 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* `stemHintArray' does not change once we start drawing the outline. */
|
|
|
|
static void
|
|
|
|
cf2_doStems( const CF2_Font font,
|
|
|
|
CF2_Stack opStack,
|
|
|
|
CF2_ArrStack stemHintArray,
|
|
|
|
CF2_Fixed* width,
|
|
|
|
FT_Bool* haveWidth,
|
|
|
|
CF2_Fixed hintOffset )
|
|
|
|
{
|
|
|
|
CF2_UInt i;
|
|
|
|
CF2_UInt count = cf2_stack_count( opStack );
|
2018-09-25 09:10:09 +02:00
|
|
|
FT_Bool hasWidthArg = FT_BOOL( count & 1 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
/* variable accumulates delta values from operand stack */
|
|
|
|
CF2_Fixed position = hintOffset;
|
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
if ( font->isT1 && !font->decoder->flex_state && !*haveWidth )
|
|
|
|
FT_ERROR(( "cf2_doStems (Type 1 mode):"
|
|
|
|
" No width. Use hsbw/sbw as first op\n" ));
|
2017-10-01 01:39:27 +02:00
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
if ( !font->isT1 && hasWidthArg && !*haveWidth )
|
2017-09-28 14:21:34 +02:00
|
|
|
*width = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
|
|
|
|
cf2_getNominalWidthX( font->decoder ) );
|
2013-06-06 21:28:36 +02:00
|
|
|
|
|
|
|
if ( font->decoder->width_only )
|
|
|
|
goto exit;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
for ( i = hasWidthArg ? 1 : 0; i < count; i += 2 )
|
|
|
|
{
|
|
|
|
/* construct a CF2_StemHint and push it onto the list */
|
|
|
|
CF2_StemHintRec stemhint;
|
|
|
|
|
|
|
|
|
2017-06-02 19:24:03 +02:00
|
|
|
stemhint.min =
|
2017-06-09 11:21:58 +02:00
|
|
|
position = ADD_INT32( position,
|
|
|
|
cf2_stack_getReal( opStack, i ) );
|
2017-06-02 19:24:03 +02:00
|
|
|
stemhint.max =
|
2017-06-09 11:21:58 +02:00
|
|
|
position = ADD_INT32( position,
|
|
|
|
cf2_stack_getReal( opStack, i + 1 ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
stemhint.used = FALSE;
|
|
|
|
stemhint.maxDS =
|
|
|
|
stemhint.minDS = 0;
|
|
|
|
|
|
|
|
cf2_arrstack_push( stemHintArray, &stemhint ); /* defer error check */
|
|
|
|
}
|
|
|
|
|
2013-06-06 21:28:36 +02:00
|
|
|
cf2_stack_clear( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2013-06-06 21:28:36 +02:00
|
|
|
exit:
|
|
|
|
/* cf2_doStems must define a width (may be default) */
|
2013-04-13 15:02:31 +02:00
|
|
|
*haveWidth = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
cf2_doFlex( CF2_Stack opStack,
|
|
|
|
CF2_Fixed* curX,
|
|
|
|
CF2_Fixed* curY,
|
|
|
|
CF2_GlyphPath glyphPath,
|
|
|
|
const FT_Bool* readFromStack,
|
|
|
|
FT_Bool doConditionalLastRead )
|
|
|
|
{
|
|
|
|
CF2_Fixed vals[14];
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx;
|
2013-04-13 15:02:31 +02:00
|
|
|
FT_Bool isHFlex;
|
|
|
|
CF2_Int top, i, j;
|
|
|
|
|
|
|
|
|
|
|
|
vals[0] = *curX;
|
|
|
|
vals[1] = *curY;
|
2017-03-27 21:00:17 +02:00
|
|
|
idx = 0;
|
2016-12-25 22:55:25 +01:00
|
|
|
isHFlex = FT_BOOL( readFromStack[9] == FALSE );
|
2013-04-13 15:02:31 +02:00
|
|
|
top = isHFlex ? 9 : 10;
|
|
|
|
|
|
|
|
for ( i = 0; i < top; i++ )
|
|
|
|
{
|
|
|
|
vals[i + 2] = vals[i];
|
|
|
|
if ( readFromStack[i] )
|
2017-06-09 11:21:58 +02:00
|
|
|
vals[i + 2] = ADD_INT32( vals[i + 2], cf2_stack_getReal( opStack,
|
|
|
|
idx++ ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( isHFlex )
|
|
|
|
vals[9 + 2] = *curY;
|
|
|
|
|
|
|
|
if ( doConditionalLastRead )
|
|
|
|
{
|
2018-09-25 09:10:09 +02:00
|
|
|
FT_Bool lastIsX = FT_BOOL(
|
2017-06-09 11:21:58 +02:00
|
|
|
cf2_fixedAbs( SUB_INT32( vals[10], *curX ) ) >
|
|
|
|
cf2_fixedAbs( SUB_INT32( vals[11], *curY ) ) );
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_Fixed lastVal = cf2_stack_getReal( opStack, idx );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
|
|
|
if ( lastIsX )
|
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
vals[12] = ADD_INT32( vals[10], lastVal );
|
2013-04-13 15:02:31 +02:00
|
|
|
vals[13] = *curY;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vals[12] = *curX;
|
2017-06-09 11:21:58 +02:00
|
|
|
vals[13] = ADD_INT32( vals[11], lastVal );
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( readFromStack[10] )
|
2017-06-09 11:21:58 +02:00
|
|
|
vals[12] = ADD_INT32( vals[10],
|
|
|
|
cf2_stack_getReal( opStack, idx++ ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
else
|
|
|
|
vals[12] = *curX;
|
|
|
|
|
|
|
|
if ( readFromStack[11] )
|
2017-06-09 11:21:58 +02:00
|
|
|
vals[13] = ADD_INT32( vals[11],
|
|
|
|
cf2_stack_getReal( opStack, idx ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
else
|
|
|
|
vals[13] = *curY;
|
|
|
|
}
|
|
|
|
|
|
|
|
for ( j = 0; j < 2; j++ )
|
|
|
|
cf2_glyphpath_curveTo( glyphPath, vals[j * 6 + 2],
|
|
|
|
vals[j * 6 + 3],
|
|
|
|
vals[j * 6 + 4],
|
|
|
|
vals[j * 6 + 5],
|
|
|
|
vals[j * 6 + 6],
|
|
|
|
vals[j * 6 + 7] );
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
|
|
|
|
*curX = vals[12];
|
|
|
|
*curY = vals[13];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
/* Blend numOperands on the stack, */
|
|
|
|
/* store results into the first numBlends values, */
|
|
|
|
/* then pop remaining arguments. */
|
|
|
|
static void
|
|
|
|
cf2_doBlend( const CFF_Blend blend,
|
|
|
|
CF2_Stack opStack,
|
|
|
|
CF2_UInt numBlends )
|
|
|
|
{
|
|
|
|
CF2_UInt delta;
|
|
|
|
CF2_UInt base;
|
|
|
|
CF2_UInt i, j;
|
|
|
|
CF2_UInt numOperands = (CF2_UInt)( numBlends * blend->lenBV );
|
|
|
|
|
|
|
|
|
|
|
|
base = cf2_stack_count( opStack ) - numOperands;
|
|
|
|
delta = base + numBlends;
|
|
|
|
|
|
|
|
for ( i = 0; i < numBlends; i++ )
|
|
|
|
{
|
|
|
|
const CF2_Fixed* weight = &blend->BV[1];
|
|
|
|
|
|
|
|
/* start with first term */
|
|
|
|
CF2_Fixed sum = cf2_stack_getReal( opStack, i + base );
|
|
|
|
|
|
|
|
|
|
|
|
for ( j = 1; j < blend->lenBV; j++ )
|
2017-06-09 11:21:58 +02:00
|
|
|
sum = ADD_INT32( sum,
|
|
|
|
FT_MulFix( *weight++,
|
|
|
|
cf2_stack_getReal( opStack,
|
|
|
|
delta++ ) ) );
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
|
|
|
|
/* store blended result */
|
|
|
|
cf2_stack_setReal( opStack, i + base, sum );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* leave only `numBlends' results on stack */
|
|
|
|
cf2_stack_pop( opStack, numOperands - numBlends );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/*
|
|
|
|
* `error' is a shared error code used by many objects in this
|
|
|
|
* routine. Before the code continues from an error, it must check and
|
|
|
|
* record the error in `*error'. The idea is that this shared
|
|
|
|
* error code will record the first error encountered. If testing
|
|
|
|
* for an error anyway, the cost of `goto exit' is small, so we do it,
|
|
|
|
* even if continuing would be safe. In this case, `lastError' is
|
|
|
|
* set, so the testing and storing can be done in one place, at `exit'.
|
|
|
|
*
|
|
|
|
* Continuing after an error is intended for objects which do their own
|
|
|
|
* testing of `*error', e.g., array stack functions. This allows us to
|
|
|
|
* avoid an extra test after the call.
|
|
|
|
*
|
|
|
|
* Unimplemented opcodes are ignored.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
cf2_interpT2CharString( CF2_Font font,
|
2021-07-24 20:32:16 +02:00
|
|
|
const CF2_Buffer buf,
|
2013-04-13 15:02:31 +02:00
|
|
|
CF2_OutlineCallbacks callbacks,
|
|
|
|
const FT_Vector* translation,
|
|
|
|
FT_Bool doingSeac,
|
|
|
|
CF2_Fixed curX,
|
|
|
|
CF2_Fixed curY,
|
|
|
|
CF2_Fixed* width )
|
|
|
|
{
|
|
|
|
/* lastError is used for errors that are immediately tested */
|
|
|
|
FT_Error lastError = FT_Err_Ok;
|
|
|
|
|
|
|
|
/* pointer to parsed font object */
|
2017-09-25 06:10:20 +02:00
|
|
|
PS_Decoder* decoder = font->decoder;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
FT_Error* error = &font->error;
|
|
|
|
FT_Memory memory = font->memory;
|
|
|
|
|
|
|
|
CF2_Fixed scaleY = font->innerTransform.d;
|
|
|
|
CF2_Fixed nominalWidthX = cf2_getNominalWidthX( decoder );
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* stuff for Type 1 */
|
|
|
|
FT_Int known_othersubr_result_cnt = 0;
|
|
|
|
FT_Bool large_int = FALSE;
|
|
|
|
FT_Bool initial_map_ready = FALSE;
|
|
|
|
|
2017-09-25 07:50:03 +02:00
|
|
|
#define PS_STORAGE_SIZE 3
|
|
|
|
CF2_F16Dot16 results[PS_STORAGE_SIZE]; /* for othersubr results */
|
|
|
|
FT_Int result_cnt = 0;
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* save this for hinting seac accents */
|
|
|
|
CF2_Fixed hintOriginY = curY;
|
|
|
|
|
|
|
|
CF2_Stack opStack = NULL;
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_UInt stackSize;
|
2013-04-13 15:02:31 +02:00
|
|
|
FT_Byte op1; /* first opcode byte */
|
|
|
|
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
CF2_F16Dot16 storage[CF2_STORAGE_SIZE]; /* for `put' and `get' */
|
2017-10-01 01:39:27 +02:00
|
|
|
CF2_F16Dot16 flexStore[6]; /* for Type 1 flex */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* instruction limit; 20,000,000 matches Avalon */
|
|
|
|
FT_UInt32 instructionLimit = 20000000UL;
|
|
|
|
|
|
|
|
CF2_ArrStackRec subrStack;
|
|
|
|
|
|
|
|
FT_Bool haveWidth;
|
|
|
|
CF2_Buffer charstring = NULL;
|
|
|
|
|
|
|
|
CF2_Int charstringIndex = -1; /* initialize to empty */
|
|
|
|
|
|
|
|
/* TODO: placeholders for hint structures */
|
|
|
|
|
|
|
|
/* objects used for hinting */
|
|
|
|
CF2_ArrStackRec hStemHintArray;
|
|
|
|
CF2_ArrStackRec vStemHintArray;
|
|
|
|
|
|
|
|
CF2_HintMaskRec hintMask;
|
|
|
|
CF2_GlyphPathRec glyphPath;
|
|
|
|
|
|
|
|
|
2016-09-06 06:33:36 +02:00
|
|
|
FT_ZERO( &storage );
|
2017-09-25 07:50:03 +02:00
|
|
|
FT_ZERO( &results );
|
2017-09-25 07:59:41 +02:00
|
|
|
FT_ZERO( &flexStore );
|
2016-09-06 06:33:36 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* initialize the remaining objects */
|
|
|
|
cf2_arrstack_init( &subrStack,
|
|
|
|
memory,
|
|
|
|
error,
|
|
|
|
sizeof ( CF2_BufferRec ) );
|
|
|
|
cf2_arrstack_init( &hStemHintArray,
|
|
|
|
memory,
|
|
|
|
error,
|
|
|
|
sizeof ( CF2_StemHintRec ) );
|
|
|
|
cf2_arrstack_init( &vStemHintArray,
|
|
|
|
memory,
|
|
|
|
error,
|
|
|
|
sizeof ( CF2_StemHintRec ) );
|
|
|
|
|
|
|
|
/* initialize CF2_StemHint arrays */
|
|
|
|
cf2_hintmask_init( &hintMask, error );
|
|
|
|
|
|
|
|
/* initialize path map to manage drawing operations */
|
|
|
|
|
|
|
|
/* Note: last 4 params are used to handle `MoveToPermissive', which */
|
|
|
|
/* may need to call `hintMap.Build' */
|
|
|
|
/* TODO: MoveToPermissive is gone; are these still needed? */
|
|
|
|
cf2_glyphpath_init( &glyphPath,
|
|
|
|
font,
|
|
|
|
callbacks,
|
|
|
|
scaleY,
|
|
|
|
/* hShift, */
|
|
|
|
&hStemHintArray,
|
|
|
|
&vStemHintArray,
|
|
|
|
&hintMask,
|
|
|
|
hintOriginY,
|
|
|
|
&font->blues,
|
|
|
|
translation );
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize state for width parsing. From the CFF Spec:
|
|
|
|
*
|
|
|
|
* The first stack-clearing operator, which must be one of hstem,
|
|
|
|
* hstemhm, vstem, vstemhm, cntrmask, hintmask, hmoveto, vmoveto,
|
|
|
|
* rmoveto, or endchar, takes an additional argument - the width (as
|
|
|
|
* described earlier), which may be expressed as zero or one numeric
|
|
|
|
* argument.
|
|
|
|
*
|
|
|
|
* What we implement here uses the first validly specified width, but
|
|
|
|
* does not detect errors for specifying more than one width.
|
|
|
|
*
|
2013-06-06 21:28:36 +02:00
|
|
|
* If one of the above operators occurs without explicitly specifying
|
|
|
|
* a width, we assume the default width.
|
|
|
|
*
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
* CFF2 charstrings always return the default width (0).
|
|
|
|
*
|
2013-04-13 15:02:31 +02:00
|
|
|
*/
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
haveWidth = font->isCFF2 ? TRUE : FALSE;
|
2013-04-13 15:02:31 +02:00
|
|
|
*width = cf2_getDefaultWidthX( decoder );
|
|
|
|
|
|
|
|
/*
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
* Note: At this point, all pointers to resources must be NULL
|
|
|
|
* and all local objects must be initialized.
|
|
|
|
* There must be no branches to `exit:' above this point.
|
2013-04-13 15:02:31 +02:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* allocate an operand stack */
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
stackSize = font->isCFF2 ? cf2_getMaxstack( decoder )
|
|
|
|
: CF2_OPERAND_STACK_SIZE;
|
|
|
|
opStack = cf2_stack_init( memory, error, stackSize );
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
if ( !opStack )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Out_Of_Memory );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* initialize subroutine stack by placing top level charstring as */
|
|
|
|
/* first element (max depth plus one for the charstring) */
|
|
|
|
/* Note: Caller owns and must finalize the first charstring. */
|
|
|
|
/* Our copy of it does not change that requirement. */
|
|
|
|
cf2_arrstack_setCount( &subrStack, CF2_MAX_SUBR + 1 );
|
|
|
|
|
|
|
|
charstring = (CF2_Buffer)cf2_arrstack_getBuffer( &subrStack );
|
|
|
|
|
|
|
|
/* catch errors so far */
|
|
|
|
if ( *error )
|
|
|
|
goto exit;
|
|
|
|
|
2019-03-05 10:25:19 +01:00
|
|
|
*charstring = *buf; /* structure copy */
|
|
|
|
charstringIndex = 0; /* entry is valid now */
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* main interpreter loop */
|
|
|
|
while ( 1 )
|
|
|
|
{
|
2017-09-25 06:59:26 +02:00
|
|
|
if ( font->isT1 )
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_ASSERT( known_othersubr_result_cnt == 0 ||
|
|
|
|
result_cnt == 0 );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
if ( cf2_buf_isEnd( charstring ) )
|
|
|
|
{
|
|
|
|
/* If we've reached the end of the charstring, simulate a */
|
|
|
|
/* cf2_cmdRETURN or cf2_cmdENDCHAR. */
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
/* We do this for both CFF and CFF2. */
|
2013-04-13 15:02:31 +02:00
|
|
|
if ( charstringIndex )
|
|
|
|
op1 = cf2_cmdRETURN; /* end of buffer for subroutine */
|
|
|
|
else
|
|
|
|
op1 = cf2_cmdENDCHAR; /* end of buffer for top level charstring */
|
|
|
|
}
|
|
|
|
else
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
{
|
2013-04-13 15:02:31 +02:00
|
|
|
op1 = (FT_Byte)cf2_buf_readByte( charstring );
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
/* Explicit RETURN and ENDCHAR in CFF2 should be ignored. */
|
|
|
|
/* Note: Trace message will report 0 instead of 11 or 14. */
|
|
|
|
if ( ( op1 == cf2_cmdRETURN || op1 == cf2_cmdENDCHAR ) &&
|
|
|
|
font->isCFF2 )
|
|
|
|
op1 = cf2_cmdRESERVED_0;
|
|
|
|
}
|
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
if ( font->isT1 )
|
|
|
|
{
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( !initial_map_ready &&
|
|
|
|
!( op1 == cf2_cmdHSTEM ||
|
|
|
|
op1 == cf2_cmdVSTEM ||
|
|
|
|
op1 == cf2_cmdHSBW ||
|
|
|
|
op1 == cf2_cmdCALLSUBR ||
|
|
|
|
op1 == cf2_cmdRETURN ||
|
|
|
|
op1 == cf2_cmdESC ||
|
|
|
|
op1 == cf2_cmdENDCHAR ||
|
2017-09-25 08:22:26 +02:00
|
|
|
op1 >= 32 /* Numbers */ ) )
|
|
|
|
{
|
2017-09-25 08:29:38 +02:00
|
|
|
/* Skip outline commands first time round. */
|
|
|
|
/* `endchar' will trigger initial hintmap build */
|
|
|
|
/* and rewind the charstring. */
|
2018-07-27 09:15:43 +02:00
|
|
|
FT_TRACE4(( " <outline command skipped>\n" ));
|
2017-09-25 08:22:26 +02:00
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( result_cnt > 0 &&
|
|
|
|
!( op1 == cf2_cmdCALLSUBR ||
|
|
|
|
op1 == cf2_cmdRETURN ||
|
|
|
|
op1 == cf2_cmdESC ||
|
2017-09-25 06:59:26 +02:00
|
|
|
op1 >= 32 /* Numbers */ ) )
|
|
|
|
{
|
|
|
|
/* all operands have been transferred by previous pops */
|
2017-09-25 07:50:03 +02:00
|
|
|
result_cnt = 0;
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( large_int && !( op1 >= 32 || op1 == cf2_escDIV ) )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" no `div' after large integer\n" ));
|
|
|
|
|
|
|
|
large_int = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* check for errors once per loop */
|
|
|
|
if ( *error )
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
instructionLimit--;
|
|
|
|
if ( instructionLimit == 0 )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch( op1 )
|
|
|
|
{
|
|
|
|
case cf2_cmdRESERVED_0:
|
|
|
|
case cf2_cmdRESERVED_2:
|
|
|
|
case cf2_cmdRESERVED_17:
|
|
|
|
/* we may get here if we have a prior error */
|
|
|
|
FT_TRACE4(( " unknown op (%d)\n", op1 ));
|
|
|
|
break;
|
|
|
|
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
case cf2_cmdVSINDEX:
|
|
|
|
FT_TRACE4(( " vsindex\n" ));
|
|
|
|
|
|
|
|
if ( !font->isCFF2 )
|
|
|
|
break; /* clear stack & ignore */
|
|
|
|
|
|
|
|
if ( font->blend.usedBV )
|
|
|
|
{
|
|
|
|
/* vsindex not allowed after blend */
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2016-12-22 08:30:15 +01:00
|
|
|
{
|
|
|
|
FT_Int temp = cf2_stack_popInt( opStack );
|
|
|
|
|
|
|
|
|
|
|
|
if ( temp >= 0 )
|
|
|
|
font->vsindex = (FT_UInt)temp;
|
|
|
|
}
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdBLEND:
|
|
|
|
{
|
|
|
|
FT_UInt numBlends;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " blend\n" ));
|
|
|
|
|
|
|
|
if ( !font->isCFF2 )
|
|
|
|
break; /* clear stack & ignore */
|
|
|
|
|
2016-12-28 21:22:45 +01:00
|
|
|
/* do we have a `blend' op in a non-variant font? */
|
|
|
|
if ( !font->blend.font )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
/* check cached blend vector */
|
2017-09-24 22:20:38 +02:00
|
|
|
if ( font->cffload->blend_check_vector( &font->blend,
|
|
|
|
font->vsindex,
|
|
|
|
font->lenNDV,
|
|
|
|
font->NDV ) )
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
{
|
2017-09-24 22:20:38 +02:00
|
|
|
lastError = font->cffload->blend_build_vector( &font->blend,
|
|
|
|
font->vsindex,
|
|
|
|
font->lenNDV,
|
|
|
|
font->NDV );
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
if ( lastError )
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* do the blend */
|
2016-12-28 08:33:35 +01:00
|
|
|
numBlends = (FT_UInt)cf2_stack_popInt( opStack );
|
|
|
|
if ( numBlends > stackSize )
|
2016-12-22 08:30:15 +01:00
|
|
|
{
|
2016-12-28 08:33:35 +01:00
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
2016-12-22 08:30:15 +01:00
|
|
|
}
|
2016-12-28 08:33:35 +01:00
|
|
|
|
[cff] Implement CFF2 support (2/2).
The font variation code. All parts dependent on the GX code in the
`truetype' module are guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT.
In other words, you can still compile the `cff' module without
defining TT_CONFIG_OPTION_GX_VAR_SUPPORT (which brings you CFF2
support without font variation).
* src/cff/cf2font.c (cf2_font_setup): Add support for font
variation.
* src/cff/cf2font.h (CF2_Font): Add fields for variation data.
* src/cff/cf2ft.c (cf2_free_instance): Free blend data.
(cf2_getVStore, cf2_getNormalizedVector): New functions.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c: Include `cffload.h'.
(cf2_cmdRESERVED_15, cf2_cmdRESERVED_16): Replace with...
(cf2_cmdVSINDEX, cf2_cmdBLEND): ... this new enum values.
(cf2_doBlend): New function.
(cf2_interpT2CharString): Handle `vsindex' and `blend' opcodes.
* src/cff/cffload.c (FT_fdot14ToFixed): New macro.
(cff_vstore_done, cff_vstore_load): New functions.
(cff_blend_clear, cff_blend_doBlend, cff_blend_build_vector,
cff_blend_check_vector): New functions.
(cff_load_private_dict): Add arguments for blend vector.
Handle blend data.
(cff_subfont_load, cff_subfont_done): Updated.
(cff_font_load): Handle CFF2 variation store data.
(cff_font_done): Updated.
* src/cff/cffload.h: Include `cffparse.h'.
Updated.
* src/cff/cffobjs.c (cff_face_done): Updated.
* src/cff/cffparse.c: Include `cffload.h'.
(cff_parse_num): Handle internal value 255.
(cff_parse_vsindex, cff_parse_blend): New functions.
(CFF_FIELD_BLEND): New macro.
(cff_parser_run): Updated.
* src/cff/cffparse.h (cff_kind_blend): New enum value.
* src/cff/cfftoken.h: Handle `vstore', `vsindex', and `blend'
dictionary values.
* src/cff/cfftypes.h (CFF_VarData, CFF_AxisCoords, CFF_VarRegion,
CFF_VStore, CFF_Blend): New structures.
(CFF_FontRecDict): Add `vstore_offset' field.
(CFF_Private): Add `vsindex' field.
(CFF_SubFont): Add fields for blend data.
(CFF_Font): Add `vstore' field.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): `CFF2' is equal to `gvar',
since glyph variation data is directly embedded.
(TT_Set_MM_Blend): Don't load `gvar' table for CFF2 fonts.
2016-12-15 21:56:44 +01:00
|
|
|
cf2_doBlend( &font->blend, opStack, numBlends );
|
|
|
|
|
|
|
|
font->blend.usedBV = TRUE;
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
case cf2_cmdHSTEMHM:
|
|
|
|
case cf2_cmdHSTEM:
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s\n", op1 == cf2_cmdHSTEMHM ? " hstemhm"
|
|
|
|
: " hstem" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 07:14:18 +02:00
|
|
|
if ( !font->isT1 )
|
|
|
|
{
|
|
|
|
/* never add hints after the mask is computed */
|
|
|
|
/* except if in Type 1 mode (no hintmask op) */
|
|
|
|
if ( cf2_hintmask_isValid( &hintMask ) )
|
|
|
|
{
|
|
|
|
FT_TRACE4(( "cf2_interpT2CharString:"
|
|
|
|
" invalid horizontal hint mask\n" ));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* add left-sidebearing correction in Type 1 mode */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_doStems( font,
|
|
|
|
opStack,
|
|
|
|
&hStemHintArray,
|
|
|
|
width,
|
|
|
|
&haveWidth,
|
2017-09-25 08:16:59 +02:00
|
|
|
font->isT1 ? decoder->builder.left_bearing->y
|
|
|
|
: 0 );
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdVSTEMHM:
|
|
|
|
case cf2_cmdVSTEM:
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s\n", op1 == cf2_cmdVSTEMHM ? " vstemhm"
|
|
|
|
: " vstem" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 07:14:18 +02:00
|
|
|
if ( !font->isT1 )
|
|
|
|
{
|
|
|
|
/* never add hints after the mask is computed */
|
|
|
|
/* except if in Type 1 mode (no hintmask op) */
|
|
|
|
if ( cf2_hintmask_isValid( &hintMask ) )
|
|
|
|
{
|
|
|
|
FT_TRACE4(( "cf2_interpT2CharString:"
|
|
|
|
" invalid vertical hint mask\n" ));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* add left-sidebearing correction in Type 1 mode */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_doStems( font,
|
|
|
|
opStack,
|
|
|
|
&vStemHintArray,
|
|
|
|
width,
|
|
|
|
&haveWidth,
|
2017-09-25 08:16:59 +02:00
|
|
|
font->isT1 ? decoder->builder.left_bearing->x
|
|
|
|
: 0 );
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdVMOVETO:
|
|
|
|
FT_TRACE4(( " vmoveto\n" ));
|
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
if ( font->isT1 && !decoder->flex_state && !haveWidth )
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" No width. Use hsbw/sbw as first op\n" ));
|
|
|
|
|
2013-06-06 21:28:36 +02:00
|
|
|
if ( cf2_stack_count( opStack ) > 1 && !haveWidth )
|
2017-06-11 13:50:37 +02:00
|
|
|
*width = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
|
|
|
|
nominalWidthX );
|
2013-06-06 21:28:36 +02:00
|
|
|
|
|
|
|
/* width is defined or default after this */
|
|
|
|
haveWidth = TRUE;
|
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2018-01-10 06:24:56 +01:00
|
|
|
if ( !decoder->flex_state )
|
|
|
|
cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdRLINETO:
|
|
|
|
{
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx;
|
2013-04-13 15:02:31 +02:00
|
|
|
CF2_UInt count = cf2_stack_count( opStack );
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " rlineto\n" ));
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
for ( idx = 0; idx < count; idx += 2 )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
curX = ADD_INT32( curX, cf2_stack_getReal( opStack,
|
|
|
|
idx + 0 ) );
|
|
|
|
curY = ADD_INT32( curY, cf2_stack_getReal( opStack,
|
|
|
|
idx + 1 ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
cf2_glyphpath_lineTo( &glyphPath, curX, curY );
|
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue; /* no need to clear stack again */
|
|
|
|
|
|
|
|
case cf2_cmdHLINETO:
|
|
|
|
case cf2_cmdVLINETO:
|
|
|
|
{
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx;
|
2013-04-13 15:02:31 +02:00
|
|
|
CF2_UInt count = cf2_stack_count( opStack );
|
|
|
|
|
2016-12-25 22:55:25 +01:00
|
|
|
FT_Bool isX = FT_BOOL( op1 == cf2_cmdHLINETO );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s\n", isX ? " hlineto" : " vlineto" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
for ( idx = 0; idx < count; idx++ )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_Fixed v = cf2_stack_getReal( opStack, idx );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
|
|
|
if ( isX )
|
2017-06-09 11:21:58 +02:00
|
|
|
curX = ADD_INT32( curX, v );
|
2013-04-13 15:02:31 +02:00
|
|
|
else
|
2017-06-09 11:21:58 +02:00
|
|
|
curY = ADD_INT32( curY, v );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
isX = !isX;
|
|
|
|
|
|
|
|
cf2_glyphpath_lineTo( &glyphPath, curX, curY );
|
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case cf2_cmdRCURVELINE:
|
|
|
|
case cf2_cmdRRCURVETO:
|
|
|
|
{
|
|
|
|
CF2_UInt count = cf2_stack_count( opStack );
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx = 0;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s\n", op1 == cf2_cmdRCURVELINE ? " rcurveline"
|
|
|
|
: " rrcurveto" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
while ( idx + 6 <= count )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
CF2_Fixed x1, y1, x2, y2, x3, y3;
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
x1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 0 ), curX );
|
|
|
|
y1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 1 ), curY );
|
|
|
|
x2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 2 ), x1 );
|
|
|
|
y2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 3 ), y1 );
|
|
|
|
x3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 4 ), x2 );
|
|
|
|
y3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 5 ), y2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
curX = x3;
|
|
|
|
curY = y3;
|
|
|
|
idx += 6;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( op1 == cf2_cmdRCURVELINE )
|
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
curX = ADD_INT32( curX, cf2_stack_getReal( opStack,
|
|
|
|
idx + 0 ) );
|
|
|
|
curY = ADD_INT32( curY, cf2_stack_getReal( opStack,
|
|
|
|
idx + 1 ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
cf2_glyphpath_lineTo( &glyphPath, curX, curY );
|
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue; /* no need to clear stack again */
|
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
case cf2_cmdCLOSEPATH:
|
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (%d)\n", op1 ));
|
|
|
|
else
|
|
|
|
{
|
2019-01-09 02:54:13 +01:00
|
|
|
FT_TRACE4(( " closepath\n" ));
|
2017-09-25 06:59:26 +02:00
|
|
|
|
|
|
|
/* if there is no path, `closepath' is a no-op */
|
2019-01-09 02:51:39 +01:00
|
|
|
cf2_glyphpath_closeOpenPath( &glyphPath );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-09-25 07:02:53 +02:00
|
|
|
haveWidth = TRUE;
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
case cf2_cmdCALLGSUBR:
|
|
|
|
case cf2_cmdCALLSUBR:
|
|
|
|
{
|
2015-10-22 10:11:23 +02:00
|
|
|
CF2_Int subrNum;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s", op1 == cf2_cmdCALLGSUBR ? " callgsubr"
|
|
|
|
: " callsubr" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( ( !font->isT1 && charstringIndex > CF2_MAX_SUBR ) ||
|
2017-09-25 07:47:10 +02:00
|
|
|
( font->isT1 && charstringIndex > T1_MAX_SUBRS_CALLS ) )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
|
|
|
/* max subr plus one for charstring */
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* overflow of stack */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* push our current CFF charstring region on subrStack */
|
|
|
|
charstring = (CF2_Buffer)
|
2015-02-20 08:37:35 +01:00
|
|
|
cf2_arrstack_getPointer(
|
|
|
|
&subrStack,
|
|
|
|
(size_t)charstringIndex + 1 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
/* set up the new CFF region and pointer */
|
2015-10-22 10:11:23 +02:00
|
|
|
subrNum = cf2_stack_popInt( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 07:47:10 +02:00
|
|
|
if ( font->isT1 && decoder->locals_hash )
|
2017-09-25 06:59:26 +02:00
|
|
|
{
|
|
|
|
size_t* val = ft_hash_num_lookup( subrNum,
|
2017-09-25 07:47:10 +02:00
|
|
|
decoder->locals_hash );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
if ( val )
|
|
|
|
subrNum = *val;
|
|
|
|
else
|
|
|
|
subrNum = -1;
|
|
|
|
}
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
switch ( op1 )
|
|
|
|
{
|
|
|
|
case cf2_cmdCALLGSUBR:
|
2015-03-27 08:33:47 +01:00
|
|
|
FT_TRACE4(( " (idx %d, entering level %d)\n",
|
2015-10-22 10:11:23 +02:00
|
|
|
subrNum + decoder->globals_bias,
|
2015-03-27 08:33:47 +01:00
|
|
|
charstringIndex + 1 ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
if ( cf2_initGlobalRegionBuffer( decoder,
|
2015-10-22 10:11:23 +02:00
|
|
|
subrNum,
|
2013-04-13 15:02:31 +02:00
|
|
|
charstring ) )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* subroutine lookup or stream error */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* cf2_cmdCALLSUBR */
|
2015-03-27 08:33:47 +01:00
|
|
|
FT_TRACE4(( " (idx %d, entering level %d)\n",
|
2015-10-22 10:11:23 +02:00
|
|
|
subrNum + decoder->locals_bias,
|
2015-03-27 08:33:47 +01:00
|
|
|
charstringIndex + 1 ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
if ( cf2_initLocalRegionBuffer( decoder,
|
2015-10-22 10:11:23 +02:00
|
|
|
subrNum,
|
2013-04-13 15:02:31 +02:00
|
|
|
charstring ) )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* subroutine lookup or stream error */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
charstringIndex += 1; /* entry is valid now */
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
|
|
|
|
|
|
|
case cf2_cmdRETURN:
|
2015-03-27 08:33:47 +01:00
|
|
|
FT_TRACE4(( " return (leaving level %d)\n", charstringIndex ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
if ( charstringIndex < 1 )
|
|
|
|
{
|
|
|
|
/* Note: cannot return from top charstring */
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* underflow of stack */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* restore position in previous charstring */
|
|
|
|
charstring = (CF2_Buffer)
|
2015-02-20 08:37:35 +01:00
|
|
|
cf2_arrstack_getPointer(
|
|
|
|
&subrStack,
|
|
|
|
(CF2_UInt)--charstringIndex );
|
2013-04-13 15:02:31 +02:00
|
|
|
continue; /* do not clear the stack */
|
|
|
|
|
|
|
|
case cf2_cmdESC:
|
|
|
|
{
|
2013-06-05 13:43:20 +02:00
|
|
|
FT_Byte op2 = (FT_Byte)cf2_buf_readByte( charstring );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
/* first switch for 2-byte operators handles CFF2 */
|
|
|
|
/* and opcodes that are reserved for both CFF and CFF2 */
|
2013-04-13 15:02:31 +02:00
|
|
|
switch ( op2 )
|
|
|
|
{
|
2016-12-06 07:25:16 +01:00
|
|
|
case cf2_escHFLEX:
|
|
|
|
{
|
|
|
|
static const FT_Bool readFromStack[12] =
|
|
|
|
{
|
|
|
|
TRUE /* dx1 */, FALSE /* dy1 */,
|
|
|
|
TRUE /* dx2 */, TRUE /* dy2 */,
|
|
|
|
TRUE /* dx3 */, FALSE /* dy3 */,
|
|
|
|
TRUE /* dx4 */, FALSE /* dy4 */,
|
|
|
|
TRUE /* dx5 */, FALSE /* dy5 */,
|
|
|
|
TRUE /* dx6 */, FALSE /* dy6 */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " hflex\n" ));
|
|
|
|
|
|
|
|
cf2_doFlex( opStack,
|
|
|
|
&curX,
|
|
|
|
&curY,
|
|
|
|
&glyphPath,
|
|
|
|
readFromStack,
|
|
|
|
FALSE /* doConditionalLastRead */ );
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case cf2_escFLEX:
|
|
|
|
{
|
|
|
|
static const FT_Bool readFromStack[12] =
|
|
|
|
{
|
|
|
|
TRUE /* dx1 */, TRUE /* dy1 */,
|
|
|
|
TRUE /* dx2 */, TRUE /* dy2 */,
|
|
|
|
TRUE /* dx3 */, TRUE /* dy3 */,
|
|
|
|
TRUE /* dx4 */, TRUE /* dy4 */,
|
|
|
|
TRUE /* dx5 */, TRUE /* dy5 */,
|
|
|
|
TRUE /* dx6 */, TRUE /* dy6 */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " flex\n" ));
|
|
|
|
|
|
|
|
cf2_doFlex( opStack,
|
|
|
|
&curX,
|
|
|
|
&curY,
|
|
|
|
&glyphPath,
|
|
|
|
readFromStack,
|
|
|
|
FALSE /* doConditionalLastRead */ );
|
|
|
|
}
|
|
|
|
break; /* TODO: why is this not a continue? */
|
|
|
|
|
|
|
|
case cf2_escHFLEX1:
|
|
|
|
{
|
|
|
|
static const FT_Bool readFromStack[12] =
|
|
|
|
{
|
|
|
|
TRUE /* dx1 */, TRUE /* dy1 */,
|
|
|
|
TRUE /* dx2 */, TRUE /* dy2 */,
|
|
|
|
TRUE /* dx3 */, FALSE /* dy3 */,
|
|
|
|
TRUE /* dx4 */, FALSE /* dy4 */,
|
|
|
|
TRUE /* dx5 */, TRUE /* dy5 */,
|
|
|
|
TRUE /* dx6 */, FALSE /* dy6 */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " hflex1\n" ));
|
|
|
|
|
|
|
|
cf2_doFlex( opStack,
|
|
|
|
&curX,
|
|
|
|
&curY,
|
|
|
|
&glyphPath,
|
|
|
|
readFromStack,
|
|
|
|
FALSE /* doConditionalLastRead */ );
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case cf2_escFLEX1:
|
|
|
|
{
|
|
|
|
static const FT_Bool readFromStack[12] =
|
|
|
|
{
|
|
|
|
TRUE /* dx1 */, TRUE /* dy1 */,
|
|
|
|
TRUE /* dx2 */, TRUE /* dy2 */,
|
|
|
|
TRUE /* dx3 */, TRUE /* dy3 */,
|
|
|
|
TRUE /* dx4 */, TRUE /* dy4 */,
|
|
|
|
TRUE /* dx5 */, TRUE /* dy5 */,
|
|
|
|
FALSE /* dx6 */, FALSE /* dy6 */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " flex1\n" ));
|
|
|
|
|
|
|
|
cf2_doFlex( opStack,
|
|
|
|
&curX,
|
|
|
|
&curY,
|
|
|
|
&glyphPath,
|
|
|
|
readFromStack,
|
|
|
|
TRUE /* doConditionalLastRead */ );
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
/* these opcodes are always reserved */
|
2016-12-06 07:25:16 +01:00
|
|
|
case cf2_escRESERVED_8:
|
|
|
|
case cf2_escRESERVED_13:
|
|
|
|
case cf2_escRESERVED_19:
|
|
|
|
case cf2_escRESERVED_25:
|
|
|
|
case cf2_escRESERVED_31:
|
|
|
|
case cf2_escRESERVED_32:
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
break;
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
default:
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
{
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
if ( font->isCFF2 || op2 >= cf2_escRESERVED_38 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
2017-09-25 08:16:59 +02:00
|
|
|
else if ( font->isT1 && result_cnt > 0 && op2 != cf2_escPOP )
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
2017-09-25 08:16:59 +02:00
|
|
|
/* all operands have been transferred by previous pops */
|
|
|
|
result_cnt = 0;
|
2017-10-01 01:39:27 +02:00
|
|
|
}
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
else
|
|
|
|
{
|
2017-10-01 01:39:27 +02:00
|
|
|
/* second switch for 2-byte operators handles */
|
|
|
|
/* CFF and Type 1 */
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
switch ( op2 )
|
|
|
|
{
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escDOTSECTION:
|
|
|
|
/* something about `flip type of locking' -- ignore it */
|
|
|
|
FT_TRACE4(( " dotsection\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
break;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
case cf2_escVSTEM3:
|
|
|
|
case cf2_escHSTEM3:
|
2017-10-01 01:39:27 +02:00
|
|
|
/*
|
|
|
|
* Type 1: Type 2:
|
|
|
|
* x0 dx0 x1 dx1 x2 dx2 vstem3 x dx {dxa dxb}* vstem
|
|
|
|
* y0 dy0 y1 dy1 y2 dy2 hstem3 y dy {dya dyb}* hstem
|
|
|
|
* relative to lsb point relative to zero
|
|
|
|
*
|
|
|
|
*/
|
2017-09-25 06:59:26 +02:00
|
|
|
{
|
2017-09-25 07:14:18 +02:00
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 v0, v1, v2;
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_Bool isV = FT_BOOL( op2 == cf2_escVSTEM3 );
|
2017-09-25 07:14:18 +02:00
|
|
|
|
|
|
|
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s\n", isV ? " vstem3"
|
|
|
|
: " hstem3" ));
|
2017-09-25 08:16:59 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_ASSERT( cf2_stack_count( opStack ) == 6 );
|
2017-09-25 07:14:18 +02:00
|
|
|
|
|
|
|
v0 = cf2_stack_getReal( opStack, 0 );
|
|
|
|
v1 = cf2_stack_getReal( opStack, 2 );
|
|
|
|
v2 = cf2_stack_getReal( opStack, 4 );
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
cf2_stack_setReal(
|
|
|
|
opStack, 2,
|
|
|
|
SUB_INT32( SUB_INT32( v1, v0 ),
|
|
|
|
cf2_stack_getReal( opStack, 1 ) ) );
|
|
|
|
cf2_stack_setReal(
|
|
|
|
opStack, 4,
|
|
|
|
SUB_INT32( SUB_INT32( v2, v1 ),
|
|
|
|
cf2_stack_getReal( opStack, 3 ) ) );
|
2017-09-25 07:14:18 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* add left-sidebearing correction */
|
2017-09-25 07:14:18 +02:00
|
|
|
cf2_doStems( font,
|
|
|
|
opStack,
|
2017-09-25 08:16:59 +02:00
|
|
|
isV ? &vStemHintArray : &hStemHintArray,
|
2017-09-25 07:14:18 +02:00
|
|
|
width,
|
|
|
|
&haveWidth,
|
2017-09-25 08:16:59 +02:00
|
|
|
isV ? decoder->builder.left_bearing->x
|
|
|
|
: decoder->builder.left_bearing->y );
|
2017-09-25 07:14:18 +02:00
|
|
|
|
|
|
|
if ( decoder->width_only )
|
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escAND:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg1;
|
|
|
|
CF2_F16Dot16 arg2;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " and\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg2 = cf2_stack_popFixed( opStack );
|
|
|
|
arg1 = cf2_stack_popFixed( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushInt( opStack, arg1 && arg2 );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escOR:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg1;
|
|
|
|
CF2_F16Dot16 arg2;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " or\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg2 = cf2_stack_popFixed( opStack );
|
|
|
|
arg1 = cf2_stack_popFixed( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushInt( opStack, arg1 || arg2 );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escNOT:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " not\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg = cf2_stack_popFixed( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushInt( opStack, !arg );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
case cf2_escSEAC:
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
else
|
2017-09-25 06:59:26 +02:00
|
|
|
{
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_Error error2;
|
|
|
|
CF2_Int bchar_index, achar_index;
|
|
|
|
FT_Vector left_bearing, advance;
|
|
|
|
|
2017-09-25 08:04:09 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
2017-10-01 01:39:27 +02:00
|
|
|
T1_Face face = (T1_Face)decoder->builder.face;
|
2017-09-25 08:04:09 +02:00
|
|
|
#endif
|
2017-10-01 01:39:27 +02:00
|
|
|
CF2_BufferRec component;
|
|
|
|
CF2_Fixed dummyWidth;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
CF2_Int achar = cf2_stack_popInt( opStack );
|
|
|
|
CF2_Int bchar = cf2_stack_popInt( opStack );
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_Pos ady = cf2_stack_popFixed ( opStack );
|
|
|
|
FT_Pos adx = cf2_stack_popFixed ( opStack );
|
|
|
|
FT_Pos asb = cf2_stack_popFixed ( opStack );
|
2017-09-25 08:04:09 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_TRACE4(( " seac\n" ));
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( doingSeac )
|
|
|
|
{
|
|
|
|
FT_ERROR(( " nested seac\n" ));
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* nested seac */
|
|
|
|
}
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( decoder->builder.metrics_only )
|
|
|
|
{
|
|
|
|
FT_ERROR(( " unexpected seac\n" ));
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* unexpected seac */
|
|
|
|
}
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* `glyph_names' is set to 0 for CID fonts which do */
|
|
|
|
/* not include an encoding. How can we deal with */
|
|
|
|
/* these? */
|
2017-09-25 08:04:09 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( decoder->glyph_names == 0 &&
|
|
|
|
!face->root.internal->incremental_interface )
|
2017-09-25 08:04:09 +02:00
|
|
|
#else
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( decoder->glyph_names == 0 )
|
2017-09-25 08:04:09 +02:00
|
|
|
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
|
|
|
|
{
|
2020-12-07 10:29:24 +01:00
|
|
|
FT_ERROR(( "cf2_interpT2CharString:\n" ));
|
|
|
|
FT_ERROR(( " (Type 1 seac) glyph names table"
|
|
|
|
" not available in this font\n" ));
|
2017-09-25 08:04:09 +02:00
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* seac weirdness */
|
|
|
|
adx += decoder->builder.left_bearing->x;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
|
|
|
if ( face->root.internal->incremental_interface )
|
|
|
|
{
|
|
|
|
/* the caller must handle the font encoding also */
|
|
|
|
bchar_index = bchar;
|
|
|
|
achar_index = achar;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
bchar_index = t1_lookup_glyph_by_stdcharcode_ps(
|
|
|
|
decoder, bchar );
|
|
|
|
achar_index = t1_lookup_glyph_by_stdcharcode_ps(
|
|
|
|
decoder, achar );
|
|
|
|
}
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( bchar_index < 0 || achar_index < 0 )
|
|
|
|
{
|
2020-12-07 10:29:24 +01:00
|
|
|
FT_ERROR(( "cf2_interpT2CharString:\n" ));
|
|
|
|
FT_ERROR(( " (Type 1 seac) invalid"
|
|
|
|
" seac character code arguments\n" ));
|
2017-10-01 01:39:27 +02:00
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* if we are trying to load a composite glyph, */
|
|
|
|
/* do not load the accent character and return */
|
|
|
|
/* the array of subglyphs. */
|
|
|
|
if ( decoder->builder.no_recurse )
|
|
|
|
{
|
|
|
|
FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
|
|
|
|
FT_GlyphLoader loader = glyph->internal->loader;
|
|
|
|
FT_SubGlyph subg;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* reallocate subglyph array if necessary */
|
|
|
|
error2 = FT_GlyphLoader_CheckSubGlyphs( loader, 2 );
|
|
|
|
if ( error2 )
|
|
|
|
{
|
|
|
|
lastError = error2; /* pass FreeType error through */
|
2017-09-25 08:04:09 +02:00
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
subg = loader->current.subglyphs;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* subglyph 0 = base character */
|
|
|
|
subg->index = bchar_index;
|
|
|
|
subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES |
|
|
|
|
FT_SUBGLYPH_FLAG_USE_MY_METRICS;
|
|
|
|
subg->arg1 = 0;
|
|
|
|
subg->arg2 = 0;
|
|
|
|
subg++;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* subglyph 1 = accent character */
|
|
|
|
subg->index = achar_index;
|
|
|
|
subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES;
|
|
|
|
subg->arg1 = (FT_Int)FIXED_TO_INT( adx - asb );
|
|
|
|
subg->arg2 = (FT_Int)FIXED_TO_INT( ady );
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* set up remaining glyph fields */
|
|
|
|
glyph->num_subglyphs = 2;
|
|
|
|
glyph->subglyphs = loader->base.subglyphs;
|
|
|
|
glyph->format = FT_GLYPH_FORMAT_COMPOSITE;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
loader->current.num_subglyphs = 2;
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* First load `bchar' in builder */
|
|
|
|
/* now load the unscaled outline */
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* prepare loader */
|
|
|
|
FT_GlyphLoader_Prepare( decoder->builder.loader );
|
2017-09-25 08:04:09 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
error2 = cf2_getT1SeacComponent( decoder,
|
|
|
|
(FT_UInt)bchar_index,
|
|
|
|
&component );
|
|
|
|
if ( error2 )
|
|
|
|
{
|
|
|
|
lastError = error2; /* pass FreeType error through */
|
2017-09-25 08:04:09 +02:00
|
|
|
goto exit;
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
2019-07-04 14:04:52 +02:00
|
|
|
|
|
|
|
/* save the left bearing and width of the SEAC */
|
|
|
|
/* glyph as they will be erased by the next load */
|
|
|
|
|
|
|
|
left_bearing = *decoder->builder.left_bearing;
|
|
|
|
advance = *decoder->builder.advance;
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
cf2_interpT2CharString( font,
|
|
|
|
&component,
|
|
|
|
callbacks,
|
|
|
|
translation,
|
|
|
|
TRUE,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
&dummyWidth );
|
|
|
|
cf2_freeT1SeacComponent( decoder, &component );
|
|
|
|
|
2019-07-04 14:04:52 +02:00
|
|
|
/* If the SEAC glyph doesn't have a (H)SBW of its */
|
|
|
|
/* own use the values from the base glyph. */
|
2017-10-01 01:39:27 +02:00
|
|
|
|
2019-07-04 14:04:52 +02:00
|
|
|
if ( !haveWidth )
|
|
|
|
{
|
|
|
|
left_bearing = *decoder->builder.left_bearing;
|
|
|
|
advance = *decoder->builder.advance;
|
|
|
|
}
|
2017-10-01 01:39:27 +02:00
|
|
|
|
|
|
|
decoder->builder.left_bearing->x = 0;
|
|
|
|
decoder->builder.left_bearing->y = 0;
|
|
|
|
|
|
|
|
/* Now load `achar' on top of */
|
|
|
|
/* the base outline */
|
|
|
|
|
|
|
|
error2 = cf2_getT1SeacComponent( decoder,
|
|
|
|
(FT_UInt)achar_index,
|
|
|
|
&component );
|
|
|
|
if ( error2 )
|
|
|
|
{
|
|
|
|
lastError = error2; /* pass FreeType error through */
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
cf2_interpT2CharString( font,
|
|
|
|
&component,
|
|
|
|
callbacks,
|
|
|
|
translation,
|
|
|
|
TRUE,
|
|
|
|
adx - asb,
|
|
|
|
ady,
|
|
|
|
&dummyWidth );
|
|
|
|
cf2_freeT1SeacComponent( decoder, &component );
|
|
|
|
|
2019-07-04 14:04:52 +02:00
|
|
|
/* restore the left side bearing and advance width */
|
|
|
|
/* of the SEAC glyph or base character (saved above) */
|
2017-10-01 01:39:27 +02:00
|
|
|
|
|
|
|
*decoder->builder.left_bearing = left_bearing;
|
|
|
|
*decoder->builder.advance = advance;
|
|
|
|
|
|
|
|
goto exit;
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_escSBW:
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
else
|
2017-09-25 06:59:26 +02:00
|
|
|
{
|
2017-10-01 01:39:27 +02:00
|
|
|
CF2_Fixed lsb_x, lsb_y;
|
|
|
|
PS_Builder* builder;
|
2017-09-25 07:11:03 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_TRACE4(( " sbw" ));
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
builder = &decoder->builder;
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
builder->advance->y = cf2_stack_popFixed( opStack );
|
|
|
|
builder->advance->x = cf2_stack_popFixed( opStack );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
lsb_y = cf2_stack_popFixed( opStack );
|
|
|
|
lsb_x = cf2_stack_popFixed( opStack );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
builder->left_bearing->x =
|
|
|
|
ADD_INT32( builder->left_bearing->x, lsb_x );
|
|
|
|
builder->left_bearing->y =
|
|
|
|
ADD_INT32( builder->left_bearing->y, lsb_y );
|
2017-09-25 07:11:03 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
haveWidth = TRUE;
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* the `metrics_only' indicates that we only want */
|
|
|
|
/* to compute the glyph's metrics (lsb + advance */
|
|
|
|
/* width), not load the rest of it; so exit */
|
|
|
|
/* immediately */
|
|
|
|
if ( builder->metrics_only )
|
|
|
|
goto exit;
|
2017-09-25 07:11:03 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( initial_map_ready )
|
|
|
|
{
|
|
|
|
curX = ADD_INT32( curX, lsb_x );
|
|
|
|
curY = ADD_INT32( curY, lsb_y );
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escABS:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " abs\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
if ( arg < -CF2_FIXED_MAX )
|
|
|
|
cf2_stack_pushFixed( opStack, CF2_FIXED_MAX );
|
|
|
|
else
|
|
|
|
cf2_stack_pushFixed( opStack, FT_ABS( arg ) );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escADD:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 summand1;
|
|
|
|
CF2_F16Dot16 summand2;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " add\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
summand2 = cf2_stack_popFixed( opStack );
|
|
|
|
summand1 = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
cf2_stack_pushFixed( opStack,
|
2017-06-09 11:21:58 +02:00
|
|
|
ADD_INT32( summand1,
|
|
|
|
summand2 ) );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escSUB:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 minuend;
|
|
|
|
CF2_F16Dot16 subtrahend;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " sub\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
subtrahend = cf2_stack_popFixed( opStack );
|
|
|
|
minuend = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
cf2_stack_pushFixed( opStack,
|
2017-06-09 11:21:58 +02:00
|
|
|
SUB_INT32( minuend, subtrahend ) );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escDIV:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 dividend;
|
|
|
|
CF2_F16Dot16 divisor;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " div\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2017-09-25 07:44:56 +02:00
|
|
|
if ( font->isT1 && large_int )
|
|
|
|
{
|
|
|
|
divisor = (CF2_F16Dot16)cf2_stack_popInt( opStack );
|
|
|
|
dividend = (CF2_F16Dot16)cf2_stack_popInt( opStack );
|
|
|
|
|
|
|
|
large_int = FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
divisor = cf2_stack_popFixed( opStack );
|
|
|
|
dividend = cf2_stack_popFixed( opStack );
|
|
|
|
}
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
FT_DivFix( dividend, divisor ) );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escNEG:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " neg\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
if ( arg < -CF2_FIXED_MAX )
|
|
|
|
cf2_stack_pushFixed( opStack, CF2_FIXED_MAX );
|
|
|
|
else
|
|
|
|
cf2_stack_pushFixed( opStack, -arg );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escEQ:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg1;
|
|
|
|
CF2_F16Dot16 arg2;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " eq\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg2 = cf2_stack_popFixed( opStack );
|
|
|
|
arg1 = cf2_stack_popFixed( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushInt( opStack, arg1 == arg2 );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
case cf2_escCALLOTHERSUBR:
|
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
else
|
|
|
|
{
|
2017-09-25 07:54:02 +02:00
|
|
|
CF2_Int subr_no;
|
|
|
|
CF2_Int arg_cnt;
|
|
|
|
CF2_UInt count;
|
|
|
|
CF2_UInt opIdx = 0;
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
|
2017-09-25 07:54:02 +02:00
|
|
|
FT_TRACE4(( " callothersubr\n" ));
|
|
|
|
|
|
|
|
subr_no = cf2_stack_popInt( opStack );
|
|
|
|
arg_cnt = cf2_stack_popInt( opStack );
|
|
|
|
|
2018-06-03 09:01:17 +02:00
|
|
|
/********************************************************
|
|
|
|
*
|
|
|
|
* remove all operands to callothersubr from the stack
|
|
|
|
*
|
|
|
|
* for handled othersubrs, where we know the number of
|
|
|
|
* arguments, we increase the stack by the value of
|
|
|
|
* known_othersubr_result_cnt
|
|
|
|
*
|
|
|
|
* for unhandled othersubrs the following pops adjust
|
2018-06-04 15:12:29 +02:00
|
|
|
* the stack pointer as necessary
|
2018-06-03 09:01:17 +02:00
|
|
|
*/
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
count = cf2_stack_count( opStack );
|
2021-06-12 10:05:07 +02:00
|
|
|
if ( (CF2_UInt)arg_cnt > count )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" stack underflow\n" ));
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-09-25 09:05:00 +02:00
|
|
|
opIdx += count - (CF2_UInt)arg_cnt;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
known_othersubr_result_cnt = 0;
|
2017-10-01 01:39:27 +02:00
|
|
|
result_cnt = 0;
|
|
|
|
|
|
|
|
/* XXX TODO: The checks to `arg_count == <whatever>' */
|
|
|
|
/* might not be correct; an othersubr expects a */
|
|
|
|
/* certain number of operands on the PostScript stack */
|
|
|
|
/* (as opposed to the T1 stack) but it doesn't have to */
|
|
|
|
/* put them there by itself; previous othersubrs might */
|
|
|
|
/* have left the operands there if they were not */
|
|
|
|
/* followed by an appropriate number of pops */
|
|
|
|
/* */
|
|
|
|
/* On the other hand, Adobe Reader 7.0.8 for Linux */
|
|
|
|
/* doesn't accept a font that contains charstrings */
|
|
|
|
/* like */
|
|
|
|
/* */
|
|
|
|
/* 100 200 2 20 callothersubr */
|
|
|
|
/* 300 1 20 callothersubr pop */
|
|
|
|
/* */
|
|
|
|
/* Perhaps this is the reason why BuildCharArray */
|
|
|
|
/* exists. */
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
switch ( subr_no )
|
|
|
|
{
|
|
|
|
case 0: /* end flex feature */
|
|
|
|
if ( arg_cnt != 3 )
|
|
|
|
goto Unexpected_OtherSubr;
|
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
if ( initial_map_ready &&
|
|
|
|
( !decoder->flex_state ||
|
|
|
|
decoder->num_flex_vectors != 7 ) )
|
2017-09-25 07:54:02 +02:00
|
|
|
{
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" unexpected flex end\n" ));
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* the two `results' are popped */
|
|
|
|
/* by the following setcurrentpoint */
|
2017-09-25 07:54:02 +02:00
|
|
|
cf2_stack_pushFixed( opStack, curX );
|
|
|
|
cf2_stack_pushFixed( opStack, curY );
|
|
|
|
known_othersubr_result_cnt = 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1: /* start flex feature */
|
|
|
|
if ( arg_cnt != 0 )
|
|
|
|
goto Unexpected_OtherSubr;
|
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
if ( !initial_map_ready )
|
|
|
|
break;
|
|
|
|
|
2017-09-25 07:59:41 +02:00
|
|
|
if ( ps_builder_check_points( &decoder->builder, 6 ) )
|
2017-09-25 07:54:02 +02:00
|
|
|
goto exit;
|
|
|
|
|
|
|
|
decoder->flex_state = 1;
|
|
|
|
decoder->num_flex_vectors = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: /* add flex vectors */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
FT_Int idx;
|
|
|
|
FT_Int idx2;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 0 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( !initial_map_ready )
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( !decoder->flex_state )
|
2017-09-25 07:54:02 +02:00
|
|
|
{
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" missing flex start\n" ));
|
2017-09-25 07:54:02 +02:00
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* note that we should not add a point for */
|
|
|
|
/* index 0; this will move our current position */
|
|
|
|
/* to the flex point without adding any point */
|
|
|
|
/* to the outline */
|
|
|
|
idx = decoder->num_flex_vectors++;
|
|
|
|
if ( idx > 0 && idx < 7 )
|
|
|
|
{
|
|
|
|
/* in malformed fonts it is possible to have */
|
|
|
|
/* other opcodes in the middle of a flex (which */
|
|
|
|
/* don't increase `num_flex_vectors'); we thus */
|
|
|
|
/* have to check whether we can add a point */
|
|
|
|
|
|
|
|
if ( ps_builder_check_points( &decoder->builder,
|
|
|
|
1 ) )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* map: 1->2 2->4 3->6 4->2 5->4 6->6 */
|
|
|
|
idx2 = ( idx > 3 ? idx - 3 : idx ) * 2;
|
|
|
|
|
|
|
|
flexStore[idx2 - 2] = curX;
|
|
|
|
flexStore[idx2 - 1] = curY;
|
|
|
|
|
|
|
|
if ( idx == 3 || idx == 6 )
|
|
|
|
cf2_glyphpath_curveTo( &glyphPath,
|
|
|
|
flexStore[0],
|
|
|
|
flexStore[1],
|
|
|
|
flexStore[2],
|
|
|
|
flexStore[3],
|
|
|
|
flexStore[4],
|
|
|
|
flexStore[5] );
|
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
}
|
2017-10-01 01:39:27 +02:00
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 3: /* change hints */
|
|
|
|
if ( arg_cnt != 1 )
|
|
|
|
goto Unexpected_OtherSubr;
|
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
if ( initial_map_ready )
|
|
|
|
{
|
2017-09-25 08:29:38 +02:00
|
|
|
/* do not clear hints if initial hintmap */
|
|
|
|
/* is not ready - we need to collate all */
|
2017-09-25 08:22:26 +02:00
|
|
|
cf2_arrstack_clear( &vStemHintArray );
|
|
|
|
cf2_arrstack_clear( &hStemHintArray );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
cf2_hintmask_init( &hintMask, error );
|
|
|
|
hintMask.isValid = FALSE;
|
|
|
|
hintMask.isNew = TRUE;
|
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 12:
|
|
|
|
case 13:
|
|
|
|
/* counter control hints, clear stack */
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 14:
|
|
|
|
case 15:
|
|
|
|
case 16:
|
|
|
|
case 17:
|
|
|
|
case 18: /* multiple masters */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
PS_Blend blend = decoder->blend;
|
|
|
|
FT_UInt num_points, nn, mm;
|
|
|
|
CF2_UInt delta;
|
|
|
|
CF2_UInt values;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( !blend )
|
|
|
|
{
|
|
|
|
FT_ERROR((
|
|
|
|
"cf2_interpT2CharString:"
|
|
|
|
" unexpected multiple masters operator\n" ));
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
num_points = (FT_UInt)subr_no - 13 +
|
|
|
|
( subr_no == 18 );
|
|
|
|
if ( arg_cnt != (FT_Int)( num_points *
|
|
|
|
blend->num_designs ) )
|
|
|
|
{
|
|
|
|
FT_ERROR((
|
|
|
|
"cf2_interpT2CharString:"
|
|
|
|
" incorrect number of multiple masters arguments\n" ));
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* We want to compute */
|
|
|
|
/* */
|
|
|
|
/* a0*w0 + a1*w1 + ... + ak*wk */
|
|
|
|
/* */
|
|
|
|
/* but we only have a0, a1-a0, a2-a0, ..., ak-a0. */
|
|
|
|
/* */
|
|
|
|
/* However, given that w0 + w1 + ... + wk == 1, we */
|
|
|
|
/* can rewrite it easily as */
|
|
|
|
/* */
|
|
|
|
/* a0 + (a1-a0)*w1 + (a2-a0)*w2 + ... + (ak-a0)*wk */
|
|
|
|
/* */
|
|
|
|
/* where k == num_designs-1. */
|
|
|
|
/* */
|
|
|
|
/* I guess that's why it's written in this `compact' */
|
|
|
|
/* form. */
|
|
|
|
/* */
|
|
|
|
delta = opIdx + num_points;
|
|
|
|
values = opIdx;
|
|
|
|
for ( nn = 0; nn < num_points; nn++ )
|
|
|
|
{
|
|
|
|
CF2_Fixed tmp = cf2_stack_getReal( opStack,
|
|
|
|
values );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
for ( mm = 1; mm < blend->num_designs; mm++ )
|
|
|
|
tmp = ADD_INT32( tmp,
|
|
|
|
FT_MulFix(
|
|
|
|
cf2_stack_getReal( opStack,
|
|
|
|
delta++ ),
|
|
|
|
blend->weight_vector[mm] ) );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
cf2_stack_setReal( opStack, values++, tmp );
|
|
|
|
}
|
|
|
|
cf2_stack_pop( opStack,
|
|
|
|
(CF2_UInt)arg_cnt - num_points );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
known_othersubr_result_cnt = (FT_Int)num_points;
|
|
|
|
break;
|
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 19:
|
2017-10-01 01:39:27 +02:00
|
|
|
/* <idx> 1 19 callothersubr */
|
|
|
|
/* ==> replace elements starting from index */
|
|
|
|
/* cvi( <idx> ) of BuildCharArray with */
|
|
|
|
/* WeightVector */
|
|
|
|
{
|
2021-10-11 05:12:12 +02:00
|
|
|
FT_UInt idx;
|
2022-02-23 02:37:43 +01:00
|
|
|
PS_Blend blend = decoder->blend;
|
|
|
|
FT_UInt len_buildchar = decoder->len_buildchar;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 1 || !blend )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
idx = (FT_UInt)cf2_stack_popInt( opStack );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2022-02-23 02:37:43 +01:00
|
|
|
if ( len_buildchar < blend->num_designs ||
|
|
|
|
len_buildchar - blend->num_designs < idx )
|
2017-10-01 01:39:27 +02:00
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2022-02-23 02:37:43 +01:00
|
|
|
if ( decoder->buildchar && blend->weight_vector )
|
|
|
|
ft_memcpy( &decoder->buildchar[idx],
|
|
|
|
blend->weight_vector,
|
|
|
|
blend->num_designs *
|
|
|
|
sizeof ( blend->weight_vector[0] ) );
|
2017-10-01 01:39:27 +02:00
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 20:
|
|
|
|
/* <arg1> <arg2> 2 20 callothersubr pop */
|
|
|
|
/* ==> push <arg1> + <arg2> onto T1 stack */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
CF2_F16Dot16 summand1;
|
|
|
|
CF2_F16Dot16 summand2;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 2 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
summand2 = cf2_stack_popFixed( opStack );
|
|
|
|
summand1 = cf2_stack_popFixed( opStack );
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
ADD_INT32( summand1,
|
|
|
|
summand2 ) );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 21:
|
|
|
|
/* <arg1> <arg2> 2 21 callothersubr pop */
|
|
|
|
/* ==> push <arg1> - <arg2> onto T1 stack */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
CF2_F16Dot16 minuend;
|
|
|
|
CF2_F16Dot16 subtrahend;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 2 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
subtrahend = cf2_stack_popFixed( opStack );
|
|
|
|
minuend = cf2_stack_popFixed( opStack );
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
SUB_INT32( minuend,
|
|
|
|
subtrahend ) );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 22:
|
|
|
|
/* <arg1> <arg2> 2 22 callothersubr pop */
|
|
|
|
/* ==> push <arg1> * <arg2> onto T1 stack */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
CF2_F16Dot16 factor1;
|
|
|
|
CF2_F16Dot16 factor2;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 2 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
factor2 = cf2_stack_popFixed( opStack );
|
|
|
|
factor1 = cf2_stack_popFixed( opStack );
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
FT_MulFix( factor1, factor2 ) );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 23:
|
|
|
|
/* <arg1> <arg2> 2 23 callothersubr pop */
|
|
|
|
/* ==> push <arg1> / <arg2> onto T1 stack */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
CF2_F16Dot16 dividend;
|
|
|
|
CF2_F16Dot16 divisor;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 2 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
divisor = cf2_stack_popFixed( opStack );
|
|
|
|
dividend = cf2_stack_popFixed( opStack );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( divisor == 0 )
|
|
|
|
goto Unexpected_OtherSubr;
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
FT_DivFix( dividend,
|
|
|
|
divisor ) );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 24:
|
|
|
|
/* <val> <idx> 2 24 callothersubr */
|
|
|
|
/* ==> set BuildCharArray[cvi( <idx> )] = <val> */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
2021-10-11 05:12:12 +02:00
|
|
|
CF2_UInt idx;
|
2017-10-01 01:39:27 +02:00
|
|
|
PS_Blend blend = decoder->blend;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 2 || !blend )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
idx = (CF2_UInt)cf2_stack_popInt( opStack );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
if ( idx >= decoder->len_buildchar )
|
2017-10-01 01:39:27 +02:00
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
decoder->buildchar[idx] =
|
|
|
|
cf2_stack_popFixed( opStack );
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 25:
|
|
|
|
/* <idx> 1 25 callothersubr pop */
|
|
|
|
/* ==> push BuildCharArray[cvi( idx )] */
|
|
|
|
/* onto T1 stack */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
2021-10-11 05:12:12 +02:00
|
|
|
CF2_UInt idx;
|
2017-10-01 01:39:27 +02:00
|
|
|
PS_Blend blend = decoder->blend;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 1 || !blend )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
idx = (CF2_UInt)cf2_stack_popInt( opStack );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
if ( idx >= decoder->len_buildchar )
|
2017-10-01 01:39:27 +02:00
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
decoder->buildchar[idx] );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
#if 0
|
|
|
|
case 26:
|
2017-10-01 01:39:27 +02:00
|
|
|
/* <val> mark <idx> */
|
|
|
|
/* ==> set BuildCharArray[cvi( <idx> )] = <val>, */
|
|
|
|
/* leave mark on T1 stack */
|
|
|
|
/* <val> <idx> */
|
|
|
|
/* ==> set BuildCharArray[cvi( <idx> )] = <val> */
|
|
|
|
XXX which routine has left its mark on the
|
|
|
|
XXX (PostScript) stack?;
|
2017-09-25 07:54:02 +02:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case 27:
|
|
|
|
/* <res1> <res2> <val1> <val2> 4 27 callothersubr pop */
|
|
|
|
/* ==> push <res1> onto T1 stack if <val1> <= <val2>, */
|
|
|
|
/* otherwise push <res2> */
|
2017-10-01 01:39:27 +02:00
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg1;
|
|
|
|
CF2_F16Dot16 arg2;
|
|
|
|
CF2_F16Dot16 cond1;
|
|
|
|
CF2_F16Dot16 cond2;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 4 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
cond2 = cf2_stack_popFixed( opStack );
|
|
|
|
cond1 = cf2_stack_popFixed( opStack );
|
|
|
|
arg2 = cf2_stack_popFixed( opStack );
|
|
|
|
arg1 = cf2_stack_popFixed( opStack );
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
cond1 <= cond2 ? arg1 : arg2 );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
case 28:
|
2017-10-01 01:39:27 +02:00
|
|
|
/* 0 28 callothersubr pop */
|
|
|
|
/* ==> push random value from interval [0, 1) */
|
|
|
|
/* onto stack */
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 r;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
if ( arg_cnt != 0 )
|
|
|
|
goto Unexpected_OtherSubr;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* only use the lower 16 bits of `random' */
|
|
|
|
/* to generate a number in the range (0;1] */
|
|
|
|
r = (CF2_F16Dot16)
|
|
|
|
( ( decoder->current_subfont->random & 0xFFFF ) + 1 );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
decoder->current_subfont->random =
|
|
|
|
cff_random( decoder->current_subfont->random );
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack, r );
|
|
|
|
known_othersubr_result_cnt = 1;
|
|
|
|
}
|
|
|
|
break;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
default:
|
|
|
|
if ( arg_cnt >= 0 && subr_no >= 0 )
|
|
|
|
{
|
2017-09-25 09:05:00 +02:00
|
|
|
FT_Int i;
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_ERROR((
|
|
|
|
"cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" unknown othersubr [%d %d], wish me luck\n",
|
|
|
|
arg_cnt, subr_no ));
|
|
|
|
|
|
|
|
/* store the unused args */
|
|
|
|
/* for this unhandled OtherSubr */
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
if ( arg_cnt > PS_STORAGE_SIZE )
|
|
|
|
arg_cnt = PS_STORAGE_SIZE;
|
|
|
|
result_cnt = arg_cnt;
|
|
|
|
|
|
|
|
for ( i = 1; i <= arg_cnt; i++ )
|
2017-10-01 01:39:27 +02:00
|
|
|
results[result_cnt - i] =
|
|
|
|
cf2_stack_popFixed( opStack );
|
2017-09-25 07:54:02 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
Unexpected_OtherSubr:
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
2017-10-01 01:39:27 +02:00
|
|
|
" invalid othersubr [%d %d]\n",
|
|
|
|
arg_cnt, subr_no ));
|
2017-09-25 07:54:02 +02:00
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
|
|
|
}
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
2017-09-25 07:54:02 +02:00
|
|
|
continue; /* do not clear the stack */
|
2017-09-25 06:59:26 +02:00
|
|
|
|
|
|
|
case cf2_escPOP:
|
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_TRACE4(( " pop" ));
|
|
|
|
|
|
|
|
if ( known_othersubr_result_cnt > 0 )
|
|
|
|
{
|
|
|
|
known_othersubr_result_cnt--;
|
|
|
|
/* ignore, we pushed the operands ourselves */
|
2017-09-25 07:50:03 +02:00
|
|
|
continue;
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
|
2017-09-25 07:50:03 +02:00
|
|
|
if ( result_cnt == 0 )
|
2017-09-25 06:59:26 +02:00
|
|
|
{
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" no more operands for othersubr\n" ));
|
2017-09-25 07:50:03 +02:00
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit;
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
|
2017-09-25 07:50:03 +02:00
|
|
|
result_cnt--;
|
|
|
|
cf2_stack_pushFixed( opStack, results[result_cnt] );
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
2017-09-25 07:50:03 +02:00
|
|
|
continue; /* do not clear the stack */
|
2017-09-25 06:59:26 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escDROP:
|
|
|
|
FT_TRACE4(( " drop\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
(void)cf2_stack_popFixed( opStack );
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escPUT:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 val;
|
2021-10-11 05:12:12 +02:00
|
|
|
CF2_UInt idx;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " put\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
idx = (CF2_UInt)cf2_stack_popInt( opStack );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
val = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
if ( idx < CF2_STORAGE_SIZE )
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
storage[idx] = val;
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escGET:
|
|
|
|
{
|
2021-10-11 05:12:12 +02:00
|
|
|
CF2_UInt idx;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " get\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
idx = (CF2_UInt)cf2_stack_popInt( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2021-10-11 05:12:12 +02:00
|
|
|
if ( idx < CF2_STORAGE_SIZE )
|
2016-12-22 08:30:15 +01:00
|
|
|
cf2_stack_pushFixed( opStack, storage[idx] );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escIFELSE:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg1;
|
|
|
|
CF2_F16Dot16 arg2;
|
|
|
|
CF2_F16Dot16 cond1;
|
|
|
|
CF2_F16Dot16 cond2;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " ifelse\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cond2 = cf2_stack_popFixed( opStack );
|
|
|
|
cond1 = cf2_stack_popFixed( opStack );
|
|
|
|
arg2 = cf2_stack_popFixed( opStack );
|
|
|
|
arg1 = cf2_stack_popFixed( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
cond1 <= cond2 ? arg1 : arg2 );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escRANDOM: /* in spec */
|
2017-02-20 09:15:13 +01:00
|
|
|
{
|
|
|
|
CF2_F16Dot16 r;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-02-20 09:15:13 +01:00
|
|
|
|
|
|
|
FT_TRACE4(( " random\n" ));
|
|
|
|
|
|
|
|
/* only use the lower 16 bits of `random' */
|
|
|
|
/* to generate a number in the range (0;1] */
|
|
|
|
r = (CF2_F16Dot16)
|
|
|
|
( ( decoder->current_subfont->random & 0xFFFF ) + 1 );
|
|
|
|
|
|
|
|
decoder->current_subfont->random =
|
|
|
|
cff_random( decoder->current_subfont->random );
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack, r );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escMUL:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 factor1;
|
|
|
|
CF2_F16Dot16 factor2;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " mul\n" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
factor2 = cf2_stack_popFixed( opStack );
|
|
|
|
factor1 = cf2_stack_popFixed( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
cf2_stack_pushFixed( opStack,
|
|
|
|
FT_MulFix( factor1, factor2 ) );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escSQRT:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " sqrt\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg = cf2_stack_popFixed( opStack );
|
|
|
|
if ( arg > 0 )
|
|
|
|
{
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
/* use a start value that doesn't make */
|
|
|
|
/* the algorithm's addition overflow */
|
|
|
|
FT_Fixed root = arg < 10 ? arg : arg >> 1;
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_Fixed new_root;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
/* Babylonian method */
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
new_root = ( root + FT_DivFix( arg, root ) + 1 ) >> 1;
|
|
|
|
if ( new_root == root )
|
|
|
|
break;
|
|
|
|
root = new_root;
|
|
|
|
}
|
|
|
|
arg = new_root;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
arg = 0;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushFixed( opStack, arg );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escDUP:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " dup\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushFixed( opStack, arg );
|
|
|
|
cf2_stack_pushFixed( opStack, arg );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escEXCH:
|
|
|
|
{
|
|
|
|
CF2_F16Dot16 arg1;
|
|
|
|
CF2_F16Dot16 arg2;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " exch\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
arg2 = cf2_stack_popFixed( opStack );
|
|
|
|
arg1 = cf2_stack_popFixed( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushFixed( opStack, arg2 );
|
|
|
|
cf2_stack_pushFixed( opStack, arg1 );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escINDEX:
|
|
|
|
{
|
|
|
|
CF2_Int idx;
|
|
|
|
CF2_UInt size;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " index\n" ));
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
idx = cf2_stack_popInt( opStack );
|
|
|
|
size = cf2_stack_count( opStack );
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
if ( size > 0 )
|
|
|
|
{
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
/* for `cf2_stack_getReal', */
|
|
|
|
/* index 0 is bottom of stack */
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
CF2_UInt gr_idx;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
if ( idx < 0 )
|
|
|
|
gr_idx = size - 1;
|
|
|
|
else if ( (CF2_UInt)idx >= size )
|
|
|
|
gr_idx = 0;
|
|
|
|
else
|
|
|
|
gr_idx = size - 1 - (CF2_UInt)idx;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_pushFixed( opStack,
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
cf2_stack_getReal( opStack,
|
|
|
|
gr_idx ) );
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
case cf2_escROLL:
|
|
|
|
{
|
|
|
|
CF2_Int idx;
|
|
|
|
CF2_Int count;
|
[cff] Implement missing operators in new engine (except `random').
* src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro.
* src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the
following operators: abs, add, and, div, drop, dup, eq, exch, get,
ifelse, index, mul, neg, not, or, put, roll, sqrt, sub.
* src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New
auxiliary function for `roll' operator.
2016-02-07 11:39:54 +01:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
FT_TRACE4(( " roll\n" ));
|
|
|
|
|
|
|
|
idx = cf2_stack_popInt( opStack );
|
|
|
|
count = cf2_stack_popInt( opStack );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
cf2_stack_roll( opStack, count, idx );
|
|
|
|
}
|
|
|
|
continue; /* do not clear the stack */
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
case cf2_escSETCURRENTPT:
|
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (12, %d)\n", op2 ));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_TRACE4(( " setcurrentpoint" ));
|
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
if ( !initial_map_ready )
|
|
|
|
break;
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* From the T1 specification, section 6.4: */
|
|
|
|
/* */
|
|
|
|
/* The setcurrentpoint command is used only in */
|
|
|
|
/* conjunction with results from OtherSubrs */
|
|
|
|
/* procedures. */
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* known_othersubr_result_cnt != 0 is already handled */
|
|
|
|
/* above. */
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* Note, however, that both Ghostscript and Adobe */
|
|
|
|
/* Distiller handle this situation by silently */
|
|
|
|
/* ignoring the inappropriate `setcurrentpoint' */
|
|
|
|
/* instruction. So we do the same. */
|
2017-09-25 06:59:26 +02:00
|
|
|
#if 0
|
|
|
|
|
|
|
|
if ( decoder->flex_state != 1 )
|
|
|
|
{
|
2017-10-01 01:39:27 +02:00
|
|
|
FT_ERROR(( "cf2_interpT2CharString:"
|
2017-09-25 06:59:26 +02:00
|
|
|
" unexpected `setcurrentpoint'\n" ));
|
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
...
|
|
|
|
#endif
|
|
|
|
|
2017-09-25 07:04:43 +02:00
|
|
|
curY = cf2_stack_popFixed( opStack );
|
|
|
|
curX = cf2_stack_popFixed( opStack );
|
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
decoder->flex_state = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
} /* end of 2nd switch checking op2 */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} /* end of 1st switch checking op2 */
|
2013-04-13 15:02:31 +02:00
|
|
|
} /* case cf2_cmdESC */
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
break;
|
|
|
|
|
2017-09-25 06:59:26 +02:00
|
|
|
case cf2_cmdHSBW:
|
|
|
|
if ( !font->isT1 )
|
|
|
|
FT_TRACE4(( " unknown op (%d)\n", op1 ));
|
|
|
|
else
|
|
|
|
{
|
2017-09-25 07:11:03 +02:00
|
|
|
CF2_Fixed lsb_x;
|
|
|
|
PS_Builder* builder;
|
|
|
|
|
|
|
|
|
2019-01-09 02:54:13 +01:00
|
|
|
FT_TRACE4(( " hsbw\n" ));
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
builder = &decoder->builder;
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
builder->advance->x = cf2_stack_popFixed( opStack );
|
|
|
|
builder->advance->y = 0;
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
lsb_x = cf2_stack_popFixed( opStack );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
builder->left_bearing->x = ADD_INT32( builder->left_bearing->x,
|
|
|
|
lsb_x );
|
2017-09-25 06:59:26 +02:00
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
haveWidth = TRUE;
|
2017-09-25 06:59:26 +02:00
|
|
|
|
|
|
|
/* the `metrics_only' indicates that we only want to compute */
|
|
|
|
/* the glyph's metrics (lsb + advance width), not load the */
|
|
|
|
/* rest of it; so exit immediately */
|
|
|
|
if ( builder->metrics_only )
|
2017-09-25 07:11:03 +02:00
|
|
|
goto exit;
|
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
if ( initial_map_ready )
|
|
|
|
curX = ADD_INT32( curX, lsb_x );
|
2017-09-25 06:59:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
case cf2_cmdENDCHAR:
|
|
|
|
FT_TRACE4(( " endchar\n" ));
|
|
|
|
|
2017-09-25 08:22:26 +02:00
|
|
|
if ( font->isT1 && !initial_map_ready )
|
|
|
|
{
|
|
|
|
FT_TRACE5(( "cf2_interpT2CharString (Type 1 mode): "
|
|
|
|
"Build initial hintmap, rewinding...\n" ));
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* trigger initial hintmap build */
|
2017-09-25 08:22:26 +02:00
|
|
|
cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
|
|
|
|
|
|
|
initial_map_ready = TRUE;
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* change hints routine - clear for rewind */
|
2017-09-25 08:22:26 +02:00
|
|
|
cf2_arrstack_clear( &vStemHintArray );
|
|
|
|
cf2_arrstack_clear( &hStemHintArray );
|
|
|
|
|
|
|
|
cf2_hintmask_init( &hintMask, error );
|
|
|
|
hintMask.isValid = FALSE;
|
|
|
|
hintMask.isNew = TRUE;
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* rewind charstring */
|
2017-10-21 10:36:49 +02:00
|
|
|
/* some charstrings use endchar from a final subroutine call */
|
|
|
|
/* without returning, detect these and exit to the top level */
|
|
|
|
/* charstring */
|
|
|
|
while ( charstringIndex > 0 )
|
|
|
|
{
|
|
|
|
FT_TRACE4(( " return (leaving level %d)\n", charstringIndex ));
|
|
|
|
|
|
|
|
/* restore position in previous charstring */
|
|
|
|
charstring = (CF2_Buffer)
|
|
|
|
cf2_arrstack_getPointer(
|
|
|
|
&subrStack,
|
|
|
|
(CF2_UInt)--charstringIndex );
|
|
|
|
}
|
2017-09-25 08:22:26 +02:00
|
|
|
charstring->ptr = charstring->start;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
if ( cf2_stack_count( opStack ) == 1 ||
|
|
|
|
cf2_stack_count( opStack ) == 5 )
|
|
|
|
{
|
|
|
|
if ( !haveWidth )
|
2017-06-09 11:21:58 +02:00
|
|
|
*width = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
|
|
|
|
nominalWidthX );
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
2013-06-06 21:28:36 +02:00
|
|
|
/* width is defined or default after this */
|
2013-04-13 15:02:31 +02:00
|
|
|
haveWidth = TRUE;
|
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* close path if still open */
|
|
|
|
cf2_glyphpath_closeOpenPath( &glyphPath );
|
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/* disable seac for CFF2 and Type1 */
|
|
|
|
/* (charstring ending with args on stack) */
|
2017-09-25 06:59:26 +02:00
|
|
|
if ( !font->isCFF2 && !font->isT1 && cf2_stack_count( opStack ) > 1 )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
|
|
|
/* must be either 4 or 5 -- */
|
|
|
|
/* this is a (deprecated) implied `seac' operator */
|
|
|
|
|
2015-02-20 08:37:35 +01:00
|
|
|
CF2_Int achar;
|
|
|
|
CF2_Int bchar;
|
2013-04-13 15:02:31 +02:00
|
|
|
CF2_BufferRec component;
|
|
|
|
CF2_Fixed dummyWidth; /* ignore component width */
|
|
|
|
FT_Error error2;
|
|
|
|
|
|
|
|
|
|
|
|
if ( doingSeac )
|
|
|
|
{
|
|
|
|
lastError = FT_THROW( Invalid_Glyph_Format );
|
|
|
|
goto exit; /* nested seac */
|
|
|
|
}
|
|
|
|
|
|
|
|
achar = cf2_stack_popInt( opStack );
|
|
|
|
bchar = cf2_stack_popInt( opStack );
|
|
|
|
|
|
|
|
curY = cf2_stack_popFixed( opStack );
|
|
|
|
curX = cf2_stack_popFixed( opStack );
|
|
|
|
|
|
|
|
error2 = cf2_getSeacComponent( decoder, achar, &component );
|
|
|
|
if ( error2 )
|
|
|
|
{
|
2016-02-07 00:39:03 +01:00
|
|
|
lastError = error2; /* pass FreeType error through */
|
|
|
|
goto exit;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
cf2_interpT2CharString( font,
|
|
|
|
&component,
|
|
|
|
callbacks,
|
|
|
|
translation,
|
|
|
|
TRUE,
|
|
|
|
curX,
|
|
|
|
curY,
|
|
|
|
&dummyWidth );
|
|
|
|
cf2_freeSeacComponent( decoder, &component );
|
|
|
|
|
|
|
|
error2 = cf2_getSeacComponent( decoder, bchar, &component );
|
|
|
|
if ( error2 )
|
|
|
|
{
|
|
|
|
lastError = error2; /* pass FreeType error through */
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
cf2_interpT2CharString( font,
|
|
|
|
&component,
|
|
|
|
callbacks,
|
|
|
|
translation,
|
|
|
|
TRUE,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
&dummyWidth );
|
|
|
|
cf2_freeSeacComponent( decoder, &component );
|
|
|
|
}
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
case cf2_cmdCNTRMASK:
|
|
|
|
case cf2_cmdHINTMASK:
|
|
|
|
/* the final \n in the tracing message gets added in */
|
|
|
|
/* `cf2_hintmask_read' (which also traces the mask bytes) */
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s", op1 == cf2_cmdCNTRMASK ? " cntrmask" : " hintmask" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2014-12-04 06:10:16 +01:00
|
|
|
/* never add hints after the mask is computed */
|
|
|
|
if ( cf2_stack_count( opStack ) > 1 &&
|
|
|
|
cf2_hintmask_isValid( &hintMask ) )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2014-12-04 06:10:16 +01:00
|
|
|
FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
|
|
|
|
break;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
2014-12-04 06:10:16 +01:00
|
|
|
/* if there are arguments on the stack, there this is an */
|
|
|
|
/* implied cf2_cmdVSTEMHM */
|
2013-04-13 15:02:31 +02:00
|
|
|
cf2_doStems( font,
|
|
|
|
opStack,
|
|
|
|
&vStemHintArray,
|
|
|
|
width,
|
|
|
|
&haveWidth,
|
|
|
|
0 );
|
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
if ( op1 == cf2_cmdHINTMASK )
|
|
|
|
{
|
|
|
|
/* consume the hint mask bytes which follow the operator */
|
|
|
|
cf2_hintmask_read( &hintMask,
|
|
|
|
charstring,
|
|
|
|
cf2_arrstack_size( &hStemHintArray ) +
|
|
|
|
cf2_arrstack_size( &vStemHintArray ) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Consume the counter mask bytes which follow the operator:
|
|
|
|
* Build a temporary hint map, just to place and lock those
|
|
|
|
* stems participating in the counter mask. These are most
|
|
|
|
* likely the dominant hstems, and are grouped together in a
|
|
|
|
* few counter groups, not necessarily in correspondence
|
|
|
|
* with the hint groups. This reduces the chances of
|
|
|
|
* conflicts between hstems that are initially placed in
|
|
|
|
* separate hint groups and then brought together. The
|
|
|
|
* positions are copied back to `hStemHintArray', so we can
|
|
|
|
* discard `counterMask' and `counterHintMap'.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
CF2_HintMapRec counterHintMap;
|
|
|
|
CF2_HintMaskRec counterMask;
|
|
|
|
|
|
|
|
|
|
|
|
cf2_hintmap_init( &counterHintMap,
|
|
|
|
font,
|
|
|
|
&glyphPath.initialHintMap,
|
|
|
|
&glyphPath.hintMoves,
|
|
|
|
scaleY );
|
|
|
|
cf2_hintmask_init( &counterMask, error );
|
|
|
|
|
|
|
|
cf2_hintmask_read( &counterMask,
|
|
|
|
charstring,
|
|
|
|
cf2_arrstack_size( &hStemHintArray ) +
|
|
|
|
cf2_arrstack_size( &vStemHintArray ) );
|
|
|
|
cf2_hintmap_build( &counterHintMap,
|
|
|
|
&hStemHintArray,
|
|
|
|
&vStemHintArray,
|
|
|
|
&counterMask,
|
|
|
|
0,
|
|
|
|
FALSE );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdRMOVETO:
|
|
|
|
FT_TRACE4(( " rmoveto\n" ));
|
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
if ( font->isT1 && !decoder->flex_state && !haveWidth )
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" No width. Use hsbw/sbw as first op\n" ));
|
|
|
|
|
2013-06-06 21:28:36 +02:00
|
|
|
if ( cf2_stack_count( opStack ) > 2 && !haveWidth )
|
2017-06-09 11:21:58 +02:00
|
|
|
*width = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
|
|
|
|
nominalWidthX );
|
2013-06-06 21:28:36 +02:00
|
|
|
|
|
|
|
/* width is defined or default after this */
|
|
|
|
haveWidth = TRUE;
|
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
|
|
|
|
curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-09-25 07:59:41 +02:00
|
|
|
if ( !decoder->flex_state )
|
|
|
|
cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdHMOVETO:
|
|
|
|
FT_TRACE4(( " hmoveto\n" ));
|
|
|
|
|
2017-09-25 07:11:03 +02:00
|
|
|
if ( font->isT1 && !decoder->flex_state && !haveWidth )
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" No width. Use hsbw/sbw as first op\n" ));
|
|
|
|
|
2013-06-06 21:28:36 +02:00
|
|
|
if ( cf2_stack_count( opStack ) > 1 && !haveWidth )
|
2017-06-09 11:21:58 +02:00
|
|
|
*width = ADD_INT32( cf2_stack_getReal( opStack, 0 ),
|
|
|
|
nominalWidthX );
|
2013-06-06 21:28:36 +02:00
|
|
|
|
|
|
|
/* width is defined or default after this */
|
|
|
|
haveWidth = TRUE;
|
|
|
|
|
2017-09-25 08:16:59 +02:00
|
|
|
if ( decoder->width_only )
|
2016-02-07 00:39:03 +01:00
|
|
|
goto exit;
|
2013-06-06 21:28:36 +02:00
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2018-01-10 06:24:56 +01:00
|
|
|
if ( !decoder->flex_state )
|
|
|
|
cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cf2_cmdRLINECURVE:
|
|
|
|
{
|
|
|
|
CF2_UInt count = cf2_stack_count( opStack );
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx = 0;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " rlinecurve\n" ));
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
while ( idx + 6 < count )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
curX = ADD_INT32( curX, cf2_stack_getReal( opStack,
|
|
|
|
idx + 0 ) );
|
|
|
|
curY = ADD_INT32( curY, cf2_stack_getReal( opStack,
|
|
|
|
idx + 1 ) );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
cf2_glyphpath_lineTo( &glyphPath, curX, curY );
|
2017-03-27 21:00:17 +02:00
|
|
|
idx += 2;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
while ( idx < count )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
[cff] 32bit integer overflow run-time errors 2/2 (#46149).
This commit handles the new engine.
* include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32,
OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG,
NEG_INT32): New macros.
* src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32.
* src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init,
cf2_hintmap_map, cf2_glyphpath_hintPoint,
cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset,
cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use
OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and
NEG_INT32 where appropriate.
* src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend,
cf2_interpT2CharString): Ditto.
Also add some other code where needed to avoid overflow.
2017-05-31 16:16:50 +02:00
|
|
|
CF2_Fixed x1, y1, x2, y2, x3, y3;
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
x1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 0 ), curX );
|
|
|
|
y1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 1 ), curY );
|
|
|
|
x2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 2 ), x1 );
|
|
|
|
y2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 3 ), y1 );
|
|
|
|
x3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 4 ), x2 );
|
|
|
|
y3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 5 ), y2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
curX = x3;
|
|
|
|
curY = y3;
|
|
|
|
idx += 6;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue; /* no need to clear stack again */
|
|
|
|
|
|
|
|
case cf2_cmdVVCURVETO:
|
|
|
|
{
|
2015-05-12 07:27:35 +02:00
|
|
|
CF2_UInt count, count1 = cf2_stack_count( opStack );
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx = 0;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
2015-05-12 07:27:35 +02:00
|
|
|
/* if `cf2_stack_count' isn't of the form 4n or 4n+1, */
|
|
|
|
/* we enforce it by clearing the second bit */
|
|
|
|
/* (and sorting the stack indexing to suit) */
|
2017-03-27 21:00:17 +02:00
|
|
|
count = count1 & ~2U;
|
|
|
|
idx += count1 - count;
|
2015-05-12 07:27:35 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
FT_TRACE4(( " vvcurveto\n" ));
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
while ( idx < count )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
|
|
|
CF2_Fixed x1, y1, x2, y2, x3, y3;
|
|
|
|
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
if ( ( count - idx ) & 1 )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
x1 = ADD_INT32( cf2_stack_getReal( opStack, idx ), curX );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
idx++;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
x1 = curX;
|
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
y1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 0 ), curY );
|
|
|
|
x2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 1 ), x1 );
|
|
|
|
y2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 2 ), y1 );
|
2013-04-13 15:02:31 +02:00
|
|
|
x3 = x2;
|
2017-06-09 11:21:58 +02:00
|
|
|
y3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 3 ), y2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
curX = x3;
|
|
|
|
curY = y3;
|
|
|
|
idx += 4;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue; /* no need to clear stack again */
|
|
|
|
|
|
|
|
case cf2_cmdHHCURVETO:
|
|
|
|
{
|
2015-05-12 07:27:35 +02:00
|
|
|
CF2_UInt count, count1 = cf2_stack_count( opStack );
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx = 0;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
2015-05-12 07:27:35 +02:00
|
|
|
/* if `cf2_stack_count' isn't of the form 4n or 4n+1, */
|
|
|
|
/* we enforce it by clearing the second bit */
|
|
|
|
/* (and sorting the stack indexing to suit) */
|
2017-03-27 21:00:17 +02:00
|
|
|
count = count1 & ~2U;
|
|
|
|
idx += count1 - count;
|
2015-05-12 07:27:35 +02:00
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
FT_TRACE4(( " hhcurveto\n" ));
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
while ( idx < count )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
|
|
|
CF2_Fixed x1, y1, x2, y2, x3, y3;
|
|
|
|
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
if ( ( count - idx ) & 1 )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
y1 = ADD_INT32( cf2_stack_getReal( opStack, idx ), curY );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
idx++;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
y1 = curY;
|
|
|
|
|
2017-06-09 11:21:58 +02:00
|
|
|
x1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 0 ), curX );
|
|
|
|
x2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 1 ), x1 );
|
|
|
|
y2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 2 ), y1 );
|
|
|
|
x3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 3 ), x2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
y3 = y2;
|
|
|
|
|
|
|
|
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
curX = x3;
|
|
|
|
curY = y3;
|
|
|
|
idx += 4;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue; /* no need to clear stack again */
|
|
|
|
|
|
|
|
case cf2_cmdVHCURVETO:
|
|
|
|
case cf2_cmdHVCURVETO:
|
|
|
|
{
|
2015-05-12 07:27:35 +02:00
|
|
|
CF2_UInt count, count1 = cf2_stack_count( opStack );
|
2017-03-27 21:00:17 +02:00
|
|
|
CF2_UInt idx = 0;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2016-12-25 22:55:25 +01:00
|
|
|
FT_Bool alternate = FT_BOOL( op1 == cf2_cmdHVCURVETO );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
|
2015-05-12 07:27:35 +02:00
|
|
|
/* if `cf2_stack_count' isn't of the form 8n, 8n+1, */
|
|
|
|
/* 8n+4, or 8n+5, we enforce it by clearing the */
|
|
|
|
/* second bit */
|
|
|
|
/* (and sorting the stack indexing to suit) */
|
2017-03-27 21:00:17 +02:00
|
|
|
count = count1 & ~2U;
|
|
|
|
idx += count1 - count;
|
2015-05-12 07:27:35 +02:00
|
|
|
|
Use formatting string in FT_TRACEX calls for non-simple arguments.
* src/psaux/cffdecode.c (cff_decoder_parse_charstrings)
<cff_op_hstem, cff_op_hintmask, cff_op_hlineto, cff_op_vhcurveto>:
Do it.
* src/psaux/pshints.c (cf2_hintmap_build): Ditto.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM,
cf2_cmdVSTEM, cf2_cmdHLINETO, cf2_cmdRRCURVETO, cf2_cmdCALLSUBR,
cf2_escHSTEM3, cf2_cmdHINTMASK, cf2_cmdHVCURVETO>: Ditto.
* src/truetype/ttinterp.c (TT_RunIns): Ditto.
2018-08-14 15:48:17 +02:00
|
|
|
FT_TRACE4(( "%s\n", alternate ? " hvcurveto" : " vhcurveto" ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
while ( idx < count )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
|
|
|
CF2_Fixed x1, x2, x3, y1, y2, y3;
|
|
|
|
|
|
|
|
|
|
|
|
if ( alternate )
|
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
x1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 0 ), curX );
|
2013-04-13 15:02:31 +02:00
|
|
|
y1 = curY;
|
2017-06-09 11:21:58 +02:00
|
|
|
x2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 1 ), x1 );
|
|
|
|
y2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 2 ), y1 );
|
|
|
|
y3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 3 ), y2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
if ( count - idx == 5 )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
x3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 4 ), x2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
idx++;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
x3 = x2;
|
|
|
|
|
|
|
|
alternate = FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
x1 = curX;
|
2017-06-09 11:21:58 +02:00
|
|
|
y1 = ADD_INT32( cf2_stack_getReal( opStack, idx + 0 ), curY );
|
|
|
|
x2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 1 ), x1 );
|
|
|
|
y2 = ADD_INT32( cf2_stack_getReal( opStack, idx + 2 ), y1 );
|
|
|
|
x3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 3 ), x2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
if ( count - idx == 5 )
|
2013-04-13 15:02:31 +02:00
|
|
|
{
|
2017-06-09 11:21:58 +02:00
|
|
|
y3 = ADD_INT32( cf2_stack_getReal( opStack, idx + 4 ), y2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
idx++;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
y3 = y2;
|
|
|
|
|
|
|
|
alternate = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
|
|
|
|
|
2017-03-27 21:00:17 +02:00
|
|
|
curX = x3;
|
|
|
|
curY = y3;
|
|
|
|
idx += 4;
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
}
|
|
|
|
continue; /* no need to clear stack again */
|
|
|
|
|
|
|
|
case cf2_cmdEXTENDEDNMBR:
|
|
|
|
{
|
|
|
|
CF2_Int v;
|
|
|
|
|
2016-01-10 12:03:36 +01:00
|
|
|
CF2_Int byte1 = cf2_buf_readByte( charstring );
|
|
|
|
CF2_Int byte2 = cf2_buf_readByte( charstring );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2016-01-10 12:03:36 +01:00
|
|
|
|
|
|
|
v = (FT_Short)( ( byte1 << 8 ) |
|
|
|
|
byte2 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
FT_TRACE4(( " %d", v ));
|
|
|
|
|
|
|
|
cf2_stack_pushInt( opStack, v );
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* numbers */
|
|
|
|
{
|
|
|
|
if ( /* op1 >= 32 && */ op1 <= 246 )
|
|
|
|
{
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
CF2_Int v;
|
|
|
|
|
|
|
|
|
|
|
|
v = op1 - 139;
|
|
|
|
|
|
|
|
FT_TRACE4(( " %d", v ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
/* -107 .. 107 */
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
cf2_stack_pushInt( opStack, v );
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
else if ( /* op1 >= 247 && */ op1 <= 250 )
|
|
|
|
{
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
CF2_Int v;
|
|
|
|
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
v = op1;
|
|
|
|
v -= 247;
|
|
|
|
v *= 256;
|
|
|
|
v += cf2_buf_readByte( charstring );
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
v += 108;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
FT_TRACE4(( " %d", v ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
/* 108 .. 1131 */
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
cf2_stack_pushInt( opStack, v );
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
else if ( /* op1 >= 251 && */ op1 <= 254 )
|
|
|
|
{
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
CF2_Int v;
|
|
|
|
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
v = op1;
|
|
|
|
v -= 251;
|
|
|
|
v *= 256;
|
|
|
|
v += cf2_buf_readByte( charstring );
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
v = -v - 108;
|
2013-04-13 15:02:31 +02:00
|
|
|
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
FT_TRACE4(( " %d", v ));
|
2013-04-13 15:02:31 +02:00
|
|
|
|
|
|
|
/* -1131 .. -108 */
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
cf2_stack_pushInt( opStack, v );
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
else /* op1 == 255 */
|
|
|
|
{
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
CF2_Fixed v;
|
|
|
|
|
2016-01-10 12:03:36 +01:00
|
|
|
FT_UInt32 byte1 = (FT_UInt32)cf2_buf_readByte( charstring );
|
|
|
|
FT_UInt32 byte2 = (FT_UInt32)cf2_buf_readByte( charstring );
|
|
|
|
FT_UInt32 byte3 = (FT_UInt32)cf2_buf_readByte( charstring );
|
|
|
|
FT_UInt32 byte4 = (FT_UInt32)cf2_buf_readByte( charstring );
|
|
|
|
|
Fix errors reported by clang's `sanitize' feature.
* include/freetype/internal/ftstream.h: Simplify and fix integer
extraction macros.
(FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32,
FT_INT8_I32, FT_INT8_U32): Removed.
(FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE,
FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for
computations and convert to signed as the last step.
* src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt,
cf2_fracToFixed): Avoid shifts of negative values.
(cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed,
unused.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdEXTENDEDNMBR,
default>: Use unsigned values for computations and convert to signed
as the last step.
Use proper types in tracing messages.
* src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned
values for computation of operands and convert to signed as the last
step.
Use proper type in tracing message.
2013-05-04 14:05:24 +02:00
|
|
|
|
2016-01-10 12:03:36 +01:00
|
|
|
v = (CF2_Fixed)( ( byte1 << 24 ) |
|
|
|
|
( byte2 << 16 ) |
|
|
|
|
( byte3 << 8 ) |
|
|
|
|
byte4 );
|
2013-04-13 15:02:31 +02:00
|
|
|
|
2017-10-01 01:39:27 +02:00
|
|
|
/*
|
|
|
|
* For Type 1:
|
|
|
|
*
|
|
|
|
* According to the specification, values > 32000 or < -32000
|
|
|
|
* must be followed by a `div' operator to make the result be
|
|
|
|
* in the range [-32000;32000]. We expect that the second
|
|
|
|
* argument of `div' is not a large number. Additionally, we
|
|
|
|
* don't handle stuff like `<large1> <large2> <num> div <num>
|
|
|
|
* div' or <large1> <large2> <num> div div'. This is probably
|
|
|
|
* not allowed anyway.
|
|
|
|
*
|
|
|
|
* <large> <num> <num>+ div is not checked but should not be
|
|
|
|
* allowed as the large value remains untouched.
|
|
|
|
*
|
|
|
|
*/
|
2017-09-25 07:44:56 +02:00
|
|
|
if ( font->isT1 )
|
|
|
|
{
|
|
|
|
if ( v > 32000 || v < -32000 )
|
|
|
|
{
|
|
|
|
if ( large_int )
|
|
|
|
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
|
|
|
|
" no `div' after large integer\n" ));
|
|
|
|
else
|
|
|
|
large_int = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
FT_TRACE4(( " %d", v ));
|
|
|
|
|
|
|
|
cf2_stack_pushInt( opStack, (CF2_Int)v );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_TRACE4(( " %.5fF", v / 65536.0 ));
|
|
|
|
|
|
|
|
cf2_stack_pushFixed( opStack, v );
|
|
|
|
}
|
2013-04-13 15:02:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
continue; /* don't clear stack */
|
|
|
|
|
|
|
|
} /* end of switch statement checking `op1' */
|
|
|
|
|
|
|
|
cf2_stack_clear( opStack );
|
|
|
|
|
|
|
|
} /* end of main interpreter loop */
|
|
|
|
|
|
|
|
/* we get here if the charstring ends without cf2_cmdENDCHAR */
|
|
|
|
FT_TRACE4(( "cf2_interpT2CharString:"
|
|
|
|
" charstring ends without ENDCHAR\n" ));
|
|
|
|
|
|
|
|
exit:
|
|
|
|
/* check whether last error seen is also the first one */
|
|
|
|
cf2_setError( error, lastError );
|
|
|
|
|
[cff] Implement CFF2 support (1/2).
This commit does not contain the blend code for font variation
support, which follows in another commit.
You should ignore whitespace while inspecting this commit.
* include/freetype/internal/tttypes.h (TT_Face): Add `isCFF2'
member.
* src/cff/cf2font.h (CF2_Font): Add `isCFF2' member.
* src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Handle `isCFF2'
flag.
(cf2_getMaxstack): New function.
* src/cff/cf2ft.h: Updated.
* src/cff/cf2intrp.c (cf2_escRESERVED_38): New enum.
(cf2_interpT2CharString): Handle CFF2 differences.
Add tracing message for errors.
* src/cff/cffdrivr.c (cff_get_glyph_name, cff_get_name_index):
Update for CFF2.
* src/cff/cffload.c (FT_FIXED_ONE): New macro.
(cff_index_init, cff_index_load_offsets, cff_index_access_element,
cff_index_get_name, cff_ft_select_get, cff_load_private_dict,
cff_subfont_load, cff_font_load): Handle CFF2.
* src/cff/cffload.h: Updated.
* src/cff/cffobjs.c (cff_face_init): Handle CFF2.
* src/cff/cffparse.c (cff_parse_maxstack): New function.
(CFFCODE_TOPDICT, CFFCODE_PRIVATE): Removed
* src/cff/cffparse.h (CFF2_MAX_STACK, CFF2_DEFAULT_STACK): New
macros.
(CFF2_CODE_TOPDICT, CFF2_CODE_FONTDICT, CFF2_CODE_PRIVATE): New
macros.
* src/cff/cfftoken.h: Add fields for CFF2 dictionaries (but no blend
stuff).
* src/cff/cfftypes.h (CFF_Index): Add `hdr_size' field.
(CFF_FontRecDict): Add `maxstack' field.
(CFF_Private): Add `subfont' field.
(CFF_Font): Add `top_dict_length' and `cff2' fields.
* src/sfnt/sfobjs.c (sfnt_load_face): Handle `CFF2' table.
2016-12-15 20:27:47 +01:00
|
|
|
if ( *error )
|
|
|
|
FT_TRACE4(( "charstring error %d\n", *error ));
|
|
|
|
|
2013-04-13 15:02:31 +02:00
|
|
|
/* free resources from objects we've used */
|
|
|
|
cf2_glyphpath_finalize( &glyphPath );
|
|
|
|
cf2_arrstack_finalize( &vStemHintArray );
|
|
|
|
cf2_arrstack_finalize( &hStemHintArray );
|
|
|
|
cf2_arrstack_finalize( &subrStack );
|
|
|
|
cf2_stack_free( opStack );
|
|
|
|
|
|
|
|
FT_TRACE4(( "\n" ));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* END */
|