2001-01-03 01:15:00 +01:00
|
|
|
/***************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* cffgload.c */
|
|
|
|
/* */
|
|
|
|
/* OpenType Glyph Loader (body). */
|
|
|
|
/* */
|
2003-04-23 08:47:12 +02:00
|
|
|
/* Copyright 1996-2001, 2002, 2003 by */
|
2001-01-03 01:15:00 +01:00
|
|
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
|
|
|
/* */
|
|
|
|
/* This file is part of the FreeType project, and may only be used, */
|
|
|
|
/* modified, and distributed under the terms of the FreeType project */
|
|
|
|
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
|
|
|
|
/* this file you indicate that you have read the license and */
|
|
|
|
/* understand and accept it fully. */
|
|
|
|
/* */
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
#include <ft2build.h>
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
#include FT_INTERNAL_CALC_H
|
|
|
|
#include FT_INTERNAL_STREAM_H
|
|
|
|
#include FT_INTERNAL_SFNT_H
|
|
|
|
#include FT_OUTLINE_H
|
|
|
|
#include FT_TRUETYPE_TAGS_H
|
2001-12-12 17:07:29 +01:00
|
|
|
#include FT_INTERNAL_POSTSCRIPT_HINTS_H
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
#include "cffobjs.h"
|
2001-03-20 12:14:24 +01:00
|
|
|
#include "cffload.h"
|
|
|
|
#include "cffgload.h"
|
2001-01-03 01:15:00 +01:00
|
|
|
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
#include "cfferrs.h"
|
2001-01-03 01:15:00 +01: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. */
|
|
|
|
/* */
|
|
|
|
#undef FT_COMPONENT
|
|
|
|
#define FT_COMPONENT trace_cffgload
|
|
|
|
|
|
|
|
|
|
|
|
typedef enum CFF_Operator_
|
|
|
|
{
|
|
|
|
cff_op_unknown = 0,
|
|
|
|
|
|
|
|
cff_op_rmoveto,
|
|
|
|
cff_op_hmoveto,
|
|
|
|
cff_op_vmoveto,
|
|
|
|
|
|
|
|
cff_op_rlineto,
|
|
|
|
cff_op_hlineto,
|
|
|
|
cff_op_vlineto,
|
|
|
|
|
|
|
|
cff_op_rrcurveto,
|
|
|
|
cff_op_hhcurveto,
|
|
|
|
cff_op_hvcurveto,
|
|
|
|
cff_op_rcurveline,
|
|
|
|
cff_op_rlinecurve,
|
|
|
|
cff_op_vhcurveto,
|
|
|
|
cff_op_vvcurveto,
|
|
|
|
|
|
|
|
cff_op_flex,
|
|
|
|
cff_op_hflex,
|
|
|
|
cff_op_hflex1,
|
|
|
|
cff_op_flex1,
|
|
|
|
|
|
|
|
cff_op_endchar,
|
|
|
|
|
|
|
|
cff_op_hstem,
|
|
|
|
cff_op_vstem,
|
|
|
|
cff_op_hstemhm,
|
|
|
|
cff_op_vstemhm,
|
|
|
|
|
|
|
|
cff_op_hintmask,
|
|
|
|
cff_op_cntrmask,
|
2001-03-20 12:14:24 +01:00
|
|
|
cff_op_dotsection, /* deprecated, acts as no-op */
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
cff_op_abs,
|
|
|
|
cff_op_add,
|
|
|
|
cff_op_sub,
|
|
|
|
cff_op_div,
|
|
|
|
cff_op_neg,
|
|
|
|
cff_op_random,
|
|
|
|
cff_op_mul,
|
|
|
|
cff_op_sqrt,
|
|
|
|
|
|
|
|
cff_op_blend,
|
|
|
|
|
|
|
|
cff_op_drop,
|
|
|
|
cff_op_exch,
|
|
|
|
cff_op_index,
|
|
|
|
cff_op_roll,
|
|
|
|
cff_op_dup,
|
|
|
|
|
|
|
|
cff_op_put,
|
|
|
|
cff_op_get,
|
|
|
|
cff_op_store,
|
|
|
|
cff_op_load,
|
|
|
|
|
|
|
|
cff_op_and,
|
|
|
|
cff_op_or,
|
|
|
|
cff_op_not,
|
|
|
|
cff_op_eq,
|
|
|
|
cff_op_ifelse,
|
|
|
|
|
|
|
|
cff_op_callsubr,
|
|
|
|
cff_op_callgsubr,
|
|
|
|
cff_op_return,
|
|
|
|
|
|
|
|
/* do not remove */
|
|
|
|
cff_op_max
|
|
|
|
|
|
|
|
} CFF_Operator;
|
|
|
|
|
|
|
|
|
|
|
|
#define CFF_COUNT_CHECK_WIDTH 0x80
|
|
|
|
#define CFF_COUNT_EXACT 0x40
|
|
|
|
#define CFF_COUNT_CLEAR_STACK 0x20
|
|
|
|
|
|
|
|
|
|
|
|
static const FT_Byte cff_argument_counts[] =
|
|
|
|
{
|
|
|
|
0, /* unknown */
|
|
|
|
|
|
|
|
2 | CFF_COUNT_CHECK_WIDTH | CFF_COUNT_EXACT, /* rmoveto */
|
|
|
|
1 | CFF_COUNT_CHECK_WIDTH | CFF_COUNT_EXACT,
|
|
|
|
1 | CFF_COUNT_CHECK_WIDTH | CFF_COUNT_EXACT,
|
|
|
|
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK, /* rlineto */
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK, /* rrcurveto */
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
0 | CFF_COUNT_CLEAR_STACK,
|
|
|
|
|
|
|
|
13, /* flex */
|
|
|
|
7,
|
|
|
|
9,
|
|
|
|
11,
|
|
|
|
|
|
|
|
0 | CFF_COUNT_CHECK_WIDTH, /* endchar */
|
|
|
|
|
|
|
|
2 | CFF_COUNT_CHECK_WIDTH, /* hstem */
|
|
|
|
2 | CFF_COUNT_CHECK_WIDTH,
|
|
|
|
2 | CFF_COUNT_CHECK_WIDTH,
|
|
|
|
2 | CFF_COUNT_CHECK_WIDTH,
|
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
0 | CFF_COUNT_CHECK_WIDTH, /* hintmask */
|
|
|
|
0 | CFF_COUNT_CHECK_WIDTH, /* cntrmask */
|
2001-03-16 14:35:56 +01:00
|
|
|
0, /* dotsection */
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
1, /* abs */
|
|
|
|
2,
|
|
|
|
2,
|
|
|
|
2,
|
|
|
|
1,
|
|
|
|
0,
|
|
|
|
2,
|
|
|
|
1,
|
|
|
|
|
|
|
|
1, /* blend */
|
|
|
|
|
|
|
|
1, /* drop */
|
|
|
|
2,
|
|
|
|
1,
|
|
|
|
2,
|
|
|
|
1,
|
|
|
|
|
|
|
|
2, /* put */
|
|
|
|
1,
|
|
|
|
4,
|
|
|
|
3,
|
|
|
|
|
|
|
|
2, /* and */
|
|
|
|
2,
|
|
|
|
1,
|
|
|
|
2,
|
|
|
|
4,
|
|
|
|
|
|
|
|
1, /* callsubr */
|
|
|
|
1,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/********** *********/
|
|
|
|
/********** *********/
|
|
|
|
/********** GENERIC CHARSTRING PARSING *********/
|
|
|
|
/********** *********/
|
|
|
|
/********** *********/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* <Function> */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
/* cff_builder_init */
|
2001-01-03 01:15:00 +01:00
|
|
|
/* */
|
|
|
|
/* <Description> */
|
|
|
|
/* Initializes a given glyph builder. */
|
|
|
|
/* */
|
|
|
|
/* <InOut> */
|
|
|
|
/* builder :: A pointer to the glyph builder to initialize. */
|
|
|
|
/* */
|
|
|
|
/* <Input> */
|
|
|
|
/* face :: The current face object. */
|
|
|
|
/* */
|
|
|
|
/* size :: The current size object. */
|
|
|
|
/* */
|
|
|
|
/* glyph :: The current glyph object. */
|
|
|
|
/* */
|
2001-06-27 21:46:12 +02:00
|
|
|
static void
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_init( CFF_Builder* builder,
|
2001-06-27 21:46:12 +02:00
|
|
|
TT_Face face,
|
|
|
|
CFF_Size size,
|
2001-12-20 14:14:18 +01:00
|
|
|
CFF_GlyphSlot glyph,
|
|
|
|
FT_Bool hinting )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
builder->path_begun = 0;
|
|
|
|
builder->load_points = 1;
|
|
|
|
|
|
|
|
builder->face = face;
|
|
|
|
builder->glyph = glyph;
|
|
|
|
builder->memory = face->root.memory;
|
|
|
|
|
|
|
|
if ( glyph )
|
|
|
|
{
|
2002-02-24 03:59:24 +01:00
|
|
|
FT_GlyphLoader loader = glyph->root.internal->loader;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
builder->loader = loader;
|
|
|
|
builder->base = &loader->base.outline;
|
|
|
|
builder->current = &loader->current.outline;
|
|
|
|
FT_GlyphLoader_Rewind( loader );
|
2001-12-20 14:14:18 +01:00
|
|
|
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
builder->hint_flags = FT_FACE(face)->internal->hint_flags;
|
2001-12-20 14:14:18 +01:00
|
|
|
builder->hints_globals = 0;
|
|
|
|
builder->hints_funcs = 0;
|
2002-02-24 03:59:24 +01:00
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
if ( hinting && size )
|
|
|
|
{
|
|
|
|
builder->hints_globals = size->internal;
|
|
|
|
builder->hints_funcs = glyph->root.internal->glyph_hints;
|
|
|
|
}
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( size )
|
|
|
|
{
|
|
|
|
builder->scale_x = size->metrics.x_scale;
|
|
|
|
builder->scale_y = size->metrics.y_scale;
|
|
|
|
}
|
|
|
|
|
|
|
|
builder->pos_x = 0;
|
|
|
|
builder->pos_y = 0;
|
|
|
|
|
|
|
|
builder->left_bearing.x = 0;
|
|
|
|
builder->left_bearing.y = 0;
|
|
|
|
builder->advance.x = 0;
|
|
|
|
builder->advance.y = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* <Function> */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
/* cff_builder_done */
|
2001-01-03 01:15:00 +01:00
|
|
|
/* */
|
|
|
|
/* <Description> */
|
|
|
|
/* Finalizes a given glyph builder. Its contents can still be used */
|
|
|
|
/* after the call, but the function saves important information */
|
|
|
|
/* within the corresponding glyph slot. */
|
|
|
|
/* */
|
|
|
|
/* <Input> */
|
|
|
|
/* builder :: A pointer to the glyph builder to finalize. */
|
|
|
|
/* */
|
2001-06-27 21:46:12 +02:00
|
|
|
static void
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_done( CFF_Builder* builder )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
CFF_GlyphSlot glyph = builder->glyph;
|
|
|
|
|
|
|
|
|
|
|
|
if ( glyph )
|
|
|
|
glyph->root.outline = *builder->base;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* <Function> */
|
2001-01-03 08:14:12 +01:00
|
|
|
/* cff_compute_bias */
|
2001-01-03 01:15:00 +01:00
|
|
|
/* */
|
|
|
|
/* <Description> */
|
|
|
|
/* Computes the bias value in dependence of the number of glyph */
|
|
|
|
/* subroutines. */
|
|
|
|
/* */
|
|
|
|
/* <Input> */
|
|
|
|
/* num_subrs :: The number of glyph subroutines. */
|
|
|
|
/* */
|
|
|
|
/* <Return> */
|
|
|
|
/* The bias value. */
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Int
|
|
|
|
cff_compute_bias( FT_UInt num_subrs )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Int result;
|
|
|
|
|
|
|
|
|
|
|
|
if ( num_subrs < 1240 )
|
|
|
|
result = 107;
|
2001-06-18 16:23:45 +02:00
|
|
|
else if ( num_subrs < 33900U )
|
2001-01-03 01:15:00 +01:00
|
|
|
result = 1131;
|
|
|
|
else
|
2001-06-18 16:23:45 +02:00
|
|
|
result = 32768U;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* <Function> */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
/* cff_decoder_init */
|
2001-01-03 01:15:00 +01:00
|
|
|
/* */
|
|
|
|
/* <Description> */
|
|
|
|
/* Initializes a given glyph decoder. */
|
|
|
|
/* */
|
|
|
|
/* <InOut> */
|
|
|
|
/* decoder :: A pointer to the glyph builder to initialize. */
|
|
|
|
/* */
|
|
|
|
/* <Input> */
|
|
|
|
/* face :: The current face object. */
|
|
|
|
/* */
|
|
|
|
/* size :: The current size object. */
|
|
|
|
/* */
|
|
|
|
/* slot :: The current glyph object. */
|
|
|
|
/* */
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( void )
|
2002-08-28 00:34:20 +02:00
|
|
|
cff_decoder_init( CFF_Decoder* decoder,
|
|
|
|
TT_Face face,
|
|
|
|
CFF_Size size,
|
|
|
|
CFF_GlyphSlot slot,
|
|
|
|
FT_Bool hinting,
|
|
|
|
FT_Render_Mode hint_mode )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
2002-03-14 09:57:10 +01:00
|
|
|
CFF_Font cff = (CFF_Font)face->extra.data;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
/* clear everything */
|
2002-07-28 07:05:24 +02:00
|
|
|
FT_MEM_ZERO( decoder, sizeof ( *decoder ) );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* initialize builder */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_init( &decoder->builder, face, size, slot, hinting );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* initialize Type2 decoder */
|
|
|
|
decoder->num_globals = cff->num_global_subrs;
|
|
|
|
decoder->globals = cff->global_subrs;
|
|
|
|
decoder->globals_bias = cff_compute_bias( decoder->num_globals );
|
2002-08-28 00:34:20 +02:00
|
|
|
|
|
|
|
decoder->hint_mode = hint_mode;
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* this function is used to select the locals subrs array */
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( void )
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_decoder_prepare( CFF_Decoder* decoder,
|
2001-06-27 21:46:12 +02:00
|
|
|
FT_UInt glyph_index )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
2002-03-14 09:57:10 +01:00
|
|
|
CFF_Font cff = (CFF_Font)decoder->builder.face->extra.data;
|
|
|
|
CFF_SubFont sub = &cff->top_font;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
/* manage CID fonts */
|
|
|
|
if ( cff->num_subfonts >= 1 )
|
|
|
|
{
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_Byte fd_index = cff_fd_select_get( &cff->fd_select, glyph_index );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
sub = cff->subfonts[fd_index];
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder->num_locals = sub->num_local_subrs;
|
|
|
|
decoder->locals = sub->local_subrs;
|
|
|
|
decoder->locals_bias = cff_compute_bias( decoder->num_locals );
|
|
|
|
|
|
|
|
decoder->glyph_width = sub->private_dict.default_width;
|
|
|
|
decoder->nominal_width = sub->private_dict.nominal_width;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* check that there is enough room for `count' more points */
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
check_points( CFF_Builder* builder,
|
|
|
|
FT_Int count )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
2002-03-14 13:56:35 +01:00
|
|
|
return FT_GlyphLoader_CheckPoints( builder->loader, count, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* add a new point, do not check space */
|
2001-06-27 21:46:12 +02:00
|
|
|
static void
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( CFF_Builder* builder,
|
|
|
|
FT_Pos x,
|
|
|
|
FT_Pos y,
|
|
|
|
FT_Byte flag )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Outline* outline = builder->current;
|
|
|
|
|
|
|
|
|
|
|
|
if ( builder->load_points )
|
|
|
|
{
|
|
|
|
FT_Vector* point = outline->points + outline->n_points;
|
|
|
|
FT_Byte* control = (FT_Byte*)outline->tags + outline->n_points;
|
|
|
|
|
|
|
|
|
|
|
|
point->x = x >> 16;
|
|
|
|
point->y = y >> 16;
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
*control = (FT_Byte)( flag ? FT_CURVE_TAG_ON : FT_CURVE_TAG_CUBIC );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
builder->last = *point;
|
|
|
|
}
|
2002-03-30 17:41:09 +01:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
outline->n_points++;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* check space for a new on-curve point, then add it */
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
2002-07-26 11:09:10 +02:00
|
|
|
cff_builder_add_point1( CFF_Builder* builder,
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_Pos x,
|
|
|
|
FT_Pos y )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
|
|
|
|
|
|
|
|
error = check_points( builder, 1 );
|
|
|
|
if ( !error )
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* check room for a new contour, then add it */
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_contour( CFF_Builder* builder )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Outline* outline = builder->current;
|
|
|
|
FT_Error error;
|
|
|
|
|
|
|
|
|
|
|
|
if ( !builder->load_points )
|
|
|
|
{
|
|
|
|
outline->n_contours++;
|
|
|
|
return CFF_Err_Ok;
|
|
|
|
}
|
|
|
|
|
2002-03-14 13:56:35 +01:00
|
|
|
error = FT_GlyphLoader_CheckPoints( builder->loader, 0, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( !error )
|
|
|
|
{
|
|
|
|
if ( outline->n_contours > 0 )
|
2001-06-20 01:03:41 +02:00
|
|
|
outline->contours[outline->n_contours - 1] =
|
|
|
|
(short)( outline->n_points - 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
outline->n_contours++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* if a path was begun, add its first on-curve point */
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_start_point( CFF_Builder* builder,
|
|
|
|
FT_Pos x,
|
|
|
|
FT_Pos y )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* test whether we are building a new contour */
|
|
|
|
if ( !builder->path_begun )
|
|
|
|
{
|
|
|
|
builder->path_begun = 1;
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
error = cff_builder_add_contour( builder );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( !error )
|
2002-07-26 11:09:10 +02:00
|
|
|
error = cff_builder_add_point1( builder, x, y );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
2002-03-30 17:41:09 +01:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* close the current contour */
|
2001-06-27 21:46:12 +02:00
|
|
|
static void
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_close_contour( CFF_Builder* builder )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Outline* outline = builder->current;
|
|
|
|
|
2002-03-30 17:41:09 +01:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
/* XXXX: We must not include the last point in the path if it */
|
|
|
|
/* is located on the first point. */
|
|
|
|
if ( outline->n_points > 1 )
|
|
|
|
{
|
|
|
|
FT_Int first = 0;
|
|
|
|
FT_Vector* p1 = outline->points + first;
|
|
|
|
FT_Vector* p2 = outline->points + outline->n_points - 1;
|
|
|
|
FT_Byte* control = (FT_Byte*)outline->tags + outline->n_points - 1;
|
|
|
|
|
|
|
|
|
|
|
|
if ( outline->n_contours > 1 )
|
|
|
|
{
|
|
|
|
first = outline->contours[outline->n_contours - 2] + 1;
|
|
|
|
p1 = outline->points + first;
|
|
|
|
}
|
|
|
|
|
2002-03-30 17:41:09 +01:00
|
|
|
/* `delete' last point only if it coincides with the first */
|
|
|
|
/* point and if it is not a control point (which can happen). */
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( p1->x == p2->x && p1->y == p2->y )
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
if ( *control == FT_CURVE_TAG_ON )
|
2001-01-03 01:15:00 +01:00
|
|
|
outline->n_points--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( outline->n_contours > 0 )
|
2001-06-20 01:03:41 +02:00
|
|
|
outline->contours[outline->n_contours - 1] =
|
|
|
|
(short)( outline->n_points - 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Int
|
2002-03-14 09:57:10 +01:00
|
|
|
cff_lookup_glyph_by_stdcharcode( CFF_Font cff,
|
2002-03-30 17:41:09 +01:00
|
|
|
FT_Int charcode )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_UInt n;
|
|
|
|
FT_UShort glyph_sid;
|
|
|
|
|
|
|
|
|
|
|
|
/* check range of standard char code */
|
|
|
|
if ( charcode < 0 || charcode > 255 )
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Get code to SID mapping from `cff_standard_encoding'. */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
glyph_sid = cff_get_standard_encoding( (FT_UInt)charcode );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
for ( n = 0; n < cff->num_glyphs; n++ )
|
|
|
|
{
|
|
|
|
if ( cff->charset.sids[n] == glyph_sid )
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
static FT_Error
|
|
|
|
cff_get_glyph_data( TT_Face face,
|
|
|
|
FT_UInt glyph_index,
|
|
|
|
FT_Byte** pointer,
|
|
|
|
FT_ULong* length )
|
|
|
|
{
|
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
|
|
|
/* For incremental fonts get the character data using the */
|
|
|
|
/* callback function. */
|
|
|
|
if ( face->root.internal->incremental_interface )
|
2002-09-05 17:10:54 +02:00
|
|
|
{
|
|
|
|
FT_Data data;
|
|
|
|
FT_Error error =
|
|
|
|
face->root.internal->incremental_interface->funcs->get_glyph_data(
|
|
|
|
face->root.internal->incremental_interface->object,
|
|
|
|
glyph_index, &data );
|
|
|
|
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
*pointer = (FT_Byte*)data.pointer;
|
2002-08-23 12:08:38 +02:00
|
|
|
*length = data.length;
|
2002-09-05 17:10:54 +02:00
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
else
|
2002-08-16 01:07:18 +02:00
|
|
|
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
|
2002-08-15 14:10:48 +02:00
|
|
|
|
|
|
|
{
|
2002-08-23 12:08:38 +02:00
|
|
|
CFF_Font cff = (CFF_Font)(face->extra.data);
|
2002-09-05 17:10:54 +02:00
|
|
|
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
return cff_index_access_element( &cff->charstrings_index, glyph_index,
|
|
|
|
pointer, length );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
cff_free_glyph_data( TT_Face face,
|
|
|
|
FT_Byte** pointer,
|
|
|
|
FT_ULong length )
|
|
|
|
{
|
2002-08-15 14:58:21 +02:00
|
|
|
#ifndef FT_CONFIG_OPTION_INCREMENTAL
|
2002-08-16 01:07:18 +02:00
|
|
|
FT_UNUSED( length );
|
2002-08-15 14:58:21 +02:00
|
|
|
#endif
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
|
|
|
/* For incremental fonts get the character data using the */
|
|
|
|
/* callback function. */
|
|
|
|
if ( face->root.internal->incremental_interface )
|
2002-09-05 17:10:54 +02:00
|
|
|
{
|
2002-08-23 12:08:38 +02:00
|
|
|
FT_Data data;
|
2002-09-05 17:10:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
data.pointer = *pointer;
|
|
|
|
data.length = length;
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
face->root.internal->incremental_interface->funcs->free_glyph_data(
|
|
|
|
face->root.internal->incremental_interface->object,&data );
|
|
|
|
}
|
|
|
|
else
|
2002-08-16 01:07:18 +02:00
|
|
|
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
|
2002-08-15 14:10:48 +02:00
|
|
|
|
|
|
|
{
|
2002-09-05 17:10:54 +02:00
|
|
|
CFF_Font cff = (CFF_Font)(face->extra.data);
|
|
|
|
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
cff_index_forget_element( &cff->charstrings_index, pointer );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-27 21:46:12 +02:00
|
|
|
static FT_Error
|
|
|
|
cff_operator_seac( CFF_Decoder* decoder,
|
|
|
|
FT_Pos adx,
|
|
|
|
FT_Pos ady,
|
|
|
|
FT_Int bchar,
|
|
|
|
FT_Int achar )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
FT_Int bchar_index, achar_index, n_base_points;
|
|
|
|
FT_Outline* base = decoder->builder.base;
|
|
|
|
TT_Face face = decoder->builder.face;
|
|
|
|
FT_Vector left_bearing, advance;
|
|
|
|
FT_Byte* charstring;
|
|
|
|
FT_ULong charstring_len;
|
|
|
|
|
2002-09-05 17:10:54 +02:00
|
|
|
|
2002-08-23 12:08:38 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
2002-09-05 17:10:54 +02:00
|
|
|
/* Incremental fonts don't necessarily have valid charsets. */
|
|
|
|
/* They use the character code, not the glyph index, in this case. */
|
2002-08-23 12:08:38 +02:00
|
|
|
if ( face->root.internal->incremental_interface )
|
2002-09-05 17:10:54 +02:00
|
|
|
{
|
2002-08-23 12:08:38 +02:00
|
|
|
bchar_index = bchar;
|
|
|
|
achar_index = achar;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
|
|
|
|
{
|
|
|
|
CFF_Font cff = (CFF_Font)(face->extra.data);
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2002-09-05 17:10:54 +02:00
|
|
|
|
2002-08-23 12:08:38 +02:00
|
|
|
bchar_index = cff_lookup_glyph_by_stdcharcode( cff, bchar );
|
|
|
|
achar_index = cff_lookup_glyph_by_stdcharcode( cff, achar );
|
2002-09-05 17:10:54 +02:00
|
|
|
}
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
if ( bchar_index < 0 || achar_index < 0 )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "cff_operator_seac:" ));
|
|
|
|
FT_ERROR(( " invalid seac character code arguments\n" ));
|
|
|
|
return CFF_Err_Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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 )
|
|
|
|
{
|
2002-03-30 17:41:09 +01:00
|
|
|
FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
|
|
|
|
FT_GlyphLoader loader = glyph->internal->loader;
|
2002-03-14 13:56:35 +01:00
|
|
|
FT_SubGlyph subg;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
/* reallocate subglyph array if necessary */
|
2002-03-14 13:56:35 +01:00
|
|
|
error = FT_GlyphLoader_CheckSubGlyphs( loader, 2 );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
subg = loader->current.subglyphs;
|
|
|
|
|
|
|
|
/* 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++;
|
|
|
|
|
|
|
|
/* subglyph 1 = accent character */
|
|
|
|
subg->index = achar_index;
|
|
|
|
subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES;
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
subg->arg1 = (FT_Int)adx;
|
|
|
|
subg->arg2 = (FT_Int)ady;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* set up remaining glyph fields */
|
|
|
|
glyph->num_subglyphs = 2;
|
|
|
|
glyph->subglyphs = loader->base.subglyphs;
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
glyph->format = FT_GLYPH_FORMAT_COMPOSITE;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
loader->current.num_subglyphs = 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First load `bchar' in builder */
|
2002-08-15 14:10:48 +02:00
|
|
|
error = cff_get_glyph_data( face, bchar_index,
|
|
|
|
&charstring, &charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( !error )
|
|
|
|
{
|
2002-08-23 12:08:38 +02:00
|
|
|
error = cff_decoder_parse_charstrings( decoder, charstring,
|
|
|
|
charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
cff_free_glyph_data( face, &charstring, charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
n_base_points = base->n_points;
|
|
|
|
|
|
|
|
/* Save the left bearing and width of the base character */
|
|
|
|
/* as they will be erased by the next load. */
|
|
|
|
|
|
|
|
left_bearing = decoder->builder.left_bearing;
|
|
|
|
advance = decoder->builder.advance;
|
|
|
|
|
|
|
|
decoder->builder.left_bearing.x = 0;
|
|
|
|
decoder->builder.left_bearing.y = 0;
|
|
|
|
|
|
|
|
/* Now load `achar' on top of the base outline. */
|
2002-08-15 14:10:48 +02:00
|
|
|
error = cff_get_glyph_data( face, achar_index,
|
|
|
|
&charstring, &charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( !error )
|
|
|
|
{
|
2002-08-16 01:07:18 +02:00
|
|
|
error = cff_decoder_parse_charstrings( decoder, charstring,
|
|
|
|
charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
cff_free_glyph_data( face, &charstring, charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Restore the left side bearing and advance width */
|
|
|
|
/* of the base character. */
|
|
|
|
decoder->builder.left_bearing = left_bearing;
|
|
|
|
decoder->builder.advance = advance;
|
|
|
|
|
|
|
|
/* Finally, move the accent. */
|
|
|
|
if ( decoder->builder.load_points )
|
|
|
|
{
|
|
|
|
FT_Outline dummy;
|
|
|
|
|
|
|
|
|
2001-06-20 01:03:41 +02:00
|
|
|
dummy.n_points = (short)( base->n_points - n_base_points );
|
2001-01-03 01:15:00 +01:00
|
|
|
dummy.points = base->points + n_base_points;
|
|
|
|
|
|
|
|
FT_Outline_Translate( &dummy, adx, ady );
|
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* <Function> */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
/* cff_decoder_parse_charstrings */
|
2001-01-03 01:15:00 +01:00
|
|
|
/* */
|
|
|
|
/* <Description> */
|
|
|
|
/* Parses a given Type 2 charstrings program. */
|
|
|
|
/* */
|
|
|
|
/* <InOut> */
|
|
|
|
/* decoder :: The current Type 1 decoder. */
|
|
|
|
/* */
|
|
|
|
/* <Input> */
|
|
|
|
/* charstring_base :: The base of the charstring stream. */
|
|
|
|
/* */
|
|
|
|
/* charstring_len :: The length in bytes of the charstring stream. */
|
|
|
|
/* */
|
|
|
|
/* <Return> */
|
|
|
|
/* FreeType error code. 0 means success. */
|
|
|
|
/* */
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_decoder_parse_charstrings( CFF_Decoder* decoder,
|
2002-07-26 11:09:10 +02:00
|
|
|
FT_Byte* charstring_base,
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
FT_ULong charstring_len )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Error error;
|
2001-01-03 01:15:00 +01:00
|
|
|
CFF_Decoder_Zone* zone;
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Byte* ip;
|
|
|
|
FT_Byte* limit;
|
2001-01-03 01:15:00 +01:00
|
|
|
CFF_Builder* builder = &decoder->builder;
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Pos x, y;
|
|
|
|
FT_Fixed seed;
|
|
|
|
FT_Fixed* stack;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
T2_Hints_Funcs hinter;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2001-12-16 09:17:33 +01:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
/* set default width */
|
|
|
|
decoder->num_hints = 0;
|
|
|
|
decoder->read_width = 1;
|
|
|
|
|
|
|
|
/* compute random seed from stack address of parameter */
|
|
|
|
seed = (FT_Fixed)(char*)&seed ^
|
|
|
|
(FT_Fixed)(char*)&decoder ^
|
|
|
|
(FT_Fixed)(char*)&charstring_base;
|
|
|
|
seed = ( seed ^ ( seed >> 10 ) ^ ( seed >> 20 ) ) & 0xFFFF;
|
|
|
|
if ( seed == 0 )
|
|
|
|
seed = 0x7384;
|
|
|
|
|
|
|
|
/* initialize the decoder */
|
|
|
|
decoder->top = decoder->stack;
|
|
|
|
decoder->zone = decoder->zones;
|
|
|
|
zone = decoder->zones;
|
|
|
|
stack = decoder->top;
|
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
hinter = (T2_Hints_Funcs) builder->hints_funcs;
|
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
builder->path_begun = 0;
|
|
|
|
|
|
|
|
zone->base = charstring_base;
|
|
|
|
limit = zone->limit = charstring_base + charstring_len;
|
|
|
|
ip = zone->cursor = zone->base;
|
|
|
|
|
2001-06-18 16:23:45 +02:00
|
|
|
error = CFF_Err_Ok;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
x = builder->pos_x;
|
|
|
|
y = builder->pos_y;
|
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
/* begin hints recording session, if any */
|
|
|
|
if ( hinter )
|
|
|
|
hinter->open( hinter->hints );
|
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
/* now, execute loop */
|
|
|
|
while ( ip < limit )
|
|
|
|
{
|
|
|
|
CFF_Operator op;
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Byte v;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
/********************************************************************/
|
|
|
|
/* */
|
|
|
|
/* Decode operator or operand */
|
|
|
|
/* */
|
|
|
|
v = *ip++;
|
|
|
|
if ( v >= 32 || v == 28 )
|
|
|
|
{
|
|
|
|
FT_Int shift = 16;
|
|
|
|
FT_Int32 val;
|
|
|
|
|
|
|
|
|
|
|
|
/* this is an operand, push it on the stack */
|
|
|
|
if ( v == 28 )
|
|
|
|
{
|
|
|
|
if ( ip + 1 >= limit )
|
|
|
|
goto Syntax_Error;
|
|
|
|
val = (FT_Short)( ( (FT_Short)ip[0] << 8 ) | ip[1] );
|
|
|
|
ip += 2;
|
|
|
|
}
|
|
|
|
else if ( v < 247 )
|
|
|
|
val = (FT_Long)v - 139;
|
|
|
|
else if ( v < 251 )
|
|
|
|
{
|
|
|
|
if ( ip >= limit )
|
|
|
|
goto Syntax_Error;
|
|
|
|
val = ( (FT_Long)v - 247 ) * 256 + *ip++ + 108;
|
|
|
|
}
|
|
|
|
else if ( v < 255 )
|
|
|
|
{
|
|
|
|
if ( ip >= limit )
|
|
|
|
goto Syntax_Error;
|
|
|
|
val = -( (FT_Long)v - 251 ) * 256 - *ip++ - 108;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( ip + 3 >= limit )
|
|
|
|
goto Syntax_Error;
|
|
|
|
val = ( (FT_Int32)ip[0] << 24 ) |
|
|
|
|
( (FT_Int32)ip[1] << 16 ) |
|
|
|
|
( (FT_Int32)ip[2] << 8 ) |
|
|
|
|
ip[3];
|
|
|
|
ip += 4;
|
|
|
|
shift = 0;
|
|
|
|
}
|
|
|
|
if ( decoder->top - stack >= CFF_MAX_OPERANDS )
|
|
|
|
goto Stack_Overflow;
|
|
|
|
|
|
|
|
val <<= shift;
|
|
|
|
*decoder->top++ = val;
|
|
|
|
|
|
|
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
|
|
|
if ( !( val & 0xFFFF ) )
|
|
|
|
FT_TRACE4(( " %d", (FT_Int32)( val >> 16 ) ));
|
|
|
|
else
|
2001-03-16 14:35:56 +01:00
|
|
|
FT_TRACE4(( " %.2f", val / 65536.0 ));
|
2001-01-03 01:15:00 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_Fixed* args = decoder->top;
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
FT_Int num_args = (FT_Int)( args - decoder->stack );
|
2001-01-03 01:15:00 +01:00
|
|
|
FT_Int req_args;
|
|
|
|
|
|
|
|
|
|
|
|
/* find operator */
|
|
|
|
op = cff_op_unknown;
|
|
|
|
|
|
|
|
switch ( v )
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
op = cff_op_hstem;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
op = cff_op_vstem;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
op = cff_op_vmoveto;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
op = cff_op_rlineto;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
op = cff_op_hlineto;
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
op = cff_op_vlineto;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
op = cff_op_rrcurveto;
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
op = cff_op_callsubr;
|
|
|
|
break;
|
|
|
|
case 11:
|
|
|
|
op = cff_op_return;
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
{
|
|
|
|
if ( ip >= limit )
|
|
|
|
goto Syntax_Error;
|
|
|
|
v = *ip++;
|
|
|
|
|
|
|
|
switch ( v )
|
|
|
|
{
|
2001-03-16 14:35:56 +01:00
|
|
|
case 0:
|
|
|
|
op = cff_op_dotsection;
|
|
|
|
break;
|
2001-01-03 01:15:00 +01:00
|
|
|
case 3:
|
|
|
|
op = cff_op_and;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
op = cff_op_or;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
op = cff_op_not;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
op = cff_op_store;
|
|
|
|
break;
|
|
|
|
case 9:
|
|
|
|
op = cff_op_abs;
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
op = cff_op_add;
|
|
|
|
break;
|
|
|
|
case 11:
|
|
|
|
op = cff_op_sub;
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
op = cff_op_div;
|
|
|
|
break;
|
|
|
|
case 13:
|
|
|
|
op = cff_op_load;
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
op = cff_op_neg;
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
op = cff_op_eq;
|
|
|
|
break;
|
|
|
|
case 18:
|
|
|
|
op = cff_op_drop;
|
|
|
|
break;
|
|
|
|
case 20:
|
|
|
|
op = cff_op_put;
|
|
|
|
break;
|
|
|
|
case 21:
|
|
|
|
op = cff_op_get;
|
|
|
|
break;
|
|
|
|
case 22:
|
|
|
|
op = cff_op_ifelse;
|
|
|
|
break;
|
|
|
|
case 23:
|
|
|
|
op = cff_op_random;
|
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
op = cff_op_mul;
|
|
|
|
break;
|
|
|
|
case 26:
|
|
|
|
op = cff_op_sqrt;
|
|
|
|
break;
|
|
|
|
case 27:
|
|
|
|
op = cff_op_dup;
|
|
|
|
break;
|
|
|
|
case 28:
|
|
|
|
op = cff_op_exch;
|
|
|
|
break;
|
|
|
|
case 29:
|
|
|
|
op = cff_op_index;
|
|
|
|
break;
|
|
|
|
case 30:
|
|
|
|
op = cff_op_roll;
|
|
|
|
break;
|
|
|
|
case 34:
|
|
|
|
op = cff_op_hflex;
|
|
|
|
break;
|
|
|
|
case 35:
|
|
|
|
op = cff_op_flex;
|
|
|
|
break;
|
|
|
|
case 36:
|
|
|
|
op = cff_op_hflex1;
|
|
|
|
break;
|
|
|
|
case 37:
|
|
|
|
op = cff_op_flex1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* decrement ip for syntax error message */
|
|
|
|
ip--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
op = cff_op_endchar;
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
op = cff_op_blend;
|
|
|
|
break;
|
|
|
|
case 18:
|
|
|
|
op = cff_op_hstemhm;
|
|
|
|
break;
|
|
|
|
case 19:
|
|
|
|
op = cff_op_hintmask;
|
|
|
|
break;
|
|
|
|
case 20:
|
|
|
|
op = cff_op_cntrmask;
|
|
|
|
break;
|
|
|
|
case 21:
|
|
|
|
op = cff_op_rmoveto;
|
|
|
|
break;
|
|
|
|
case 22:
|
|
|
|
op = cff_op_hmoveto;
|
|
|
|
break;
|
|
|
|
case 23:
|
|
|
|
op = cff_op_vstemhm;
|
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
op = cff_op_rcurveline;
|
|
|
|
break;
|
|
|
|
case 25:
|
|
|
|
op = cff_op_rlinecurve;
|
|
|
|
break;
|
|
|
|
case 26:
|
|
|
|
op = cff_op_vvcurveto;
|
|
|
|
break;
|
|
|
|
case 27:
|
|
|
|
op = cff_op_hhcurveto;
|
|
|
|
break;
|
|
|
|
case 29:
|
|
|
|
op = cff_op_callgsubr;
|
|
|
|
break;
|
|
|
|
case 30:
|
|
|
|
op = cff_op_vhcurveto;
|
|
|
|
break;
|
|
|
|
case 31:
|
|
|
|
op = cff_op_hvcurveto;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
if ( op == cff_op_unknown )
|
|
|
|
goto Syntax_Error;
|
|
|
|
|
|
|
|
/* check arguments */
|
|
|
|
req_args = cff_argument_counts[op];
|
|
|
|
if ( req_args & CFF_COUNT_CHECK_WIDTH )
|
|
|
|
{
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
if ( num_args > 0 && decoder->read_width )
|
|
|
|
{
|
|
|
|
/* If `nominal_width' is non-zero, the number is really a */
|
|
|
|
/* difference against `nominal_width'. Else, the number here */
|
|
|
|
/* is truly a width, not a difference against `nominal_width'. */
|
|
|
|
/* If the font does not set `nominal_width', then */
|
|
|
|
/* `nominal_width' defaults to zero, and so we can set */
|
|
|
|
/* `glyph_width' to `nominal_width' plus number on the stack */
|
|
|
|
/* -- for either case. */
|
|
|
|
|
|
|
|
FT_Int set_width_ok;
|
|
|
|
|
|
|
|
|
|
|
|
switch ( op )
|
|
|
|
{
|
|
|
|
case cff_op_hmoveto:
|
|
|
|
case cff_op_vmoveto:
|
|
|
|
set_width_ok = num_args & 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_hstem:
|
|
|
|
case cff_op_vstem:
|
|
|
|
case cff_op_hstemhm:
|
|
|
|
case cff_op_vstemhm:
|
|
|
|
case cff_op_rmoveto:
|
|
|
|
set_width_ok = num_args & 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_endchar:
|
|
|
|
/* If there is a width specified for endchar, we either have */
|
|
|
|
/* 1 argument or 5 arguments. We like to argue. */
|
|
|
|
set_width_ok = ( ( num_args == 5 ) || ( num_args == 1 ) );
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
set_width_ok = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( set_width_ok )
|
|
|
|
{
|
|
|
|
decoder->glyph_width = decoder->nominal_width +
|
|
|
|
( stack[0] >> 16 );
|
|
|
|
|
|
|
|
/* Consumed an argument. */
|
|
|
|
num_args--;
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder->read_width = 0;
|
|
|
|
req_args = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
req_args &= 15;
|
|
|
|
if ( num_args < req_args )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
args -= req_args;
|
|
|
|
num_args -= req_args;
|
|
|
|
|
|
|
|
switch ( op )
|
|
|
|
{
|
|
|
|
case cff_op_hstem:
|
|
|
|
case cff_op_vstem:
|
|
|
|
case cff_op_hstemhm:
|
|
|
|
case cff_op_vstemhm:
|
2001-12-12 17:07:29 +01:00
|
|
|
/* the number of arguments is always even here */
|
2001-01-03 01:15:00 +01:00
|
|
|
FT_TRACE4(( op == cff_op_hstem ? " hstem" :
|
2001-12-12 17:07:29 +01:00
|
|
|
( op == cff_op_vstem ? " vstem" :
|
2001-12-16 09:17:33 +01:00
|
|
|
( op == cff_op_hstemhm ? " hstemhm" : " vstemhm" ) ) ));
|
2001-12-14 15:52:58 +01:00
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
if ( hinter )
|
|
|
|
hinter->stems( hinter->hints,
|
2001-12-21 16:59:43 +01:00
|
|
|
( op == cff_op_hstem || op == cff_op_hstemhm ),
|
2001-12-16 09:17:33 +01:00
|
|
|
num_args / 2,
|
2001-12-12 17:07:29 +01:00
|
|
|
args );
|
2001-12-14 15:52:58 +01:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
decoder->num_hints += num_args / 2;
|
|
|
|
args = stack;
|
|
|
|
break;
|
2001-12-14 15:52:58 +01:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
case cff_op_hintmask:
|
|
|
|
case cff_op_cntrmask:
|
2001-12-12 17:07:29 +01:00
|
|
|
FT_TRACE4(( op == cff_op_hintmask ? " hintmask" : " cntrmask" ));
|
2002-02-24 03:59:24 +01:00
|
|
|
|
2001-12-22 15:38:40 +01:00
|
|
|
/* implement vstem when needed -- */
|
2001-12-21 22:21:13 +01:00
|
|
|
/* the specification doesn't say it, but this also works */
|
2001-12-22 15:38:40 +01:00
|
|
|
/* with the 'cntrmask' operator */
|
2001-12-21 22:21:13 +01:00
|
|
|
/* */
|
2001-12-20 14:14:18 +01:00
|
|
|
if ( num_args > 0 )
|
|
|
|
{
|
|
|
|
if ( hinter )
|
|
|
|
hinter->stems( hinter->hints,
|
2001-12-21 16:59:43 +01:00
|
|
|
0,
|
2001-12-20 14:14:18 +01:00
|
|
|
num_args / 2,
|
|
|
|
args );
|
2002-02-24 03:59:24 +01:00
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
decoder->num_hints += num_args / 2;
|
|
|
|
}
|
2001-03-16 14:35:56 +01:00
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
if ( hinter )
|
|
|
|
{
|
|
|
|
if ( op == cff_op_hintmask )
|
|
|
|
hinter->hintmask( hinter->hints,
|
|
|
|
builder->current->n_points,
|
2001-12-20 14:14:18 +01:00
|
|
|
decoder->num_hints,
|
2001-12-12 17:07:29 +01:00
|
|
|
ip );
|
|
|
|
else
|
|
|
|
hinter->counter( hinter->hints,
|
2001-12-20 14:14:18 +01:00
|
|
|
decoder->num_hints,
|
2001-12-12 17:07:29 +01:00
|
|
|
ip );
|
|
|
|
}
|
2001-12-14 15:52:58 +01:00
|
|
|
|
2001-03-16 14:35:56 +01:00
|
|
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
|
|
|
{
|
|
|
|
FT_UInt maskbyte;
|
|
|
|
|
2002-03-30 17:41:09 +01:00
|
|
|
|
2001-03-16 14:35:56 +01:00
|
|
|
FT_TRACE4(( " " ));
|
|
|
|
|
* builds/win32/detekt.mk: Fix .PHONY target for Intel compiler.
Renamed "ftnames.h" to "ftsnames.h", and FT_NAMES_H to
FT_SFNT_NAMES_H.
* docs/docmaker.py: Added generation of INDEX link in table of
contents.
* INSTALL, docs/BUILD: Updated documentation to indicate that the
compilation process has changed slightly (no more `src' required in
* builds/*/*-def.mk: Changed the objects directory from "obj" to
"objs".
* include/freetype/config/ftheader.h: Removed obsolete macros like
FT_SOURCE_FILE, etc. and added cache-specific macro definitions that
were previously defined in <freetype/ftcache.h>. Added comments to
be included in a new API Reference section.
* src/*/*: Removed the use of FT_SOURCE_FILE, etc. Now, each
component needs to add its own directory to the include path at
compile time. Modified all "rules.mk" and "descrip.mms"
accordingly.
* src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c,
src/type1/t1load.c, src/type1/t1objs.c: Added a few casts to remove
compiler warnings in pedantic modes.
* include/config/ft2build.h, include/config/ftheader.h: The file
top-level <ft2build.h>.
* include/config/ftheader.h: Added new section describing the #include
macros.
the Type 2 glyph charstring (used by conversion programs).
* docs/docmaker.py: Added cross-references generation as well as
seac emulation provided by the Type 2 endchar operator.
* src/cid/cidafm.c, src/cid/cidafm.h: removed un-needed files,
Added support for clipped direct rendering in the smooth renderer.
* src/cff/t2objs.c (T2_Init_Face): For pure CFF fonts, set
2001-03-20 23:58:56 +01:00
|
|
|
for ( maskbyte = 0;
|
2001-04-20 10:50:36 +02:00
|
|
|
maskbyte < (FT_UInt)(( decoder->num_hints + 7 ) >> 3);
|
* builds/win32/detekt.mk: Fix .PHONY target for Intel compiler.
Renamed "ftnames.h" to "ftsnames.h", and FT_NAMES_H to
FT_SFNT_NAMES_H.
* docs/docmaker.py: Added generation of INDEX link in table of
contents.
* INSTALL, docs/BUILD: Updated documentation to indicate that the
compilation process has changed slightly (no more `src' required in
* builds/*/*-def.mk: Changed the objects directory from "obj" to
"objs".
* include/freetype/config/ftheader.h: Removed obsolete macros like
FT_SOURCE_FILE, etc. and added cache-specific macro definitions that
were previously defined in <freetype/ftcache.h>. Added comments to
be included in a new API Reference section.
* src/*/*: Removed the use of FT_SOURCE_FILE, etc. Now, each
component needs to add its own directory to the include path at
compile time. Modified all "rules.mk" and "descrip.mms"
accordingly.
* src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c,
src/type1/t1load.c, src/type1/t1objs.c: Added a few casts to remove
compiler warnings in pedantic modes.
* include/config/ft2build.h, include/config/ftheader.h: The file
top-level <ft2build.h>.
* include/config/ftheader.h: Added new section describing the #include
macros.
the Type 2 glyph charstring (used by conversion programs).
* docs/docmaker.py: Added cross-references generation as well as
seac emulation provided by the Type 2 endchar operator.
* src/cid/cidafm.c, src/cid/cidafm.h: removed un-needed files,
Added support for clipped direct rendering in the smooth renderer.
* src/cff/t2objs.c (T2_Init_Face): For pure CFF fonts, set
2001-03-20 23:58:56 +01:00
|
|
|
maskbyte++, ip++ )
|
2001-03-16 14:35:56 +01:00
|
|
|
FT_TRACE4(( "%02X", *ip ));
|
|
|
|
}
|
|
|
|
#else
|
2001-01-03 01:15:00 +01:00
|
|
|
ip += ( decoder->num_hints + 7 ) >> 3;
|
2001-03-16 14:35:56 +01:00
|
|
|
#endif
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( ip >= limit )
|
|
|
|
goto Syntax_Error;
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_rmoveto:
|
|
|
|
FT_TRACE4(( " rmoveto" ));
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_close_contour( builder );
|
2001-01-03 01:15:00 +01:00
|
|
|
builder->path_begun = 0;
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_vmoveto:
|
|
|
|
FT_TRACE4(( " vmoveto" ));
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_close_contour( builder );
|
2001-01-03 01:15:00 +01:00
|
|
|
builder->path_begun = 0;
|
|
|
|
y += args[0];
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_hmoveto:
|
|
|
|
FT_TRACE4(( " hmoveto" ));
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_close_contour( builder );
|
2001-01-03 01:15:00 +01:00
|
|
|
builder->path_begun = 0;
|
|
|
|
x += args[0];
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_rlineto:
|
|
|
|
FT_TRACE4(( " rlineto" ));
|
|
|
|
|
2002-07-26 11:09:10 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) ||
|
|
|
|
check_points( builder, num_args / 2 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
if ( num_args < 2 || num_args & 1 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
while ( args < decoder->top )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 2;
|
|
|
|
}
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_hlineto:
|
|
|
|
case cff_op_vlineto:
|
|
|
|
{
|
|
|
|
FT_Int phase = ( op == cff_op_hlineto );
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( op == cff_op_hlineto ? " hlineto"
|
2001-01-03 08:14:12 +01:00
|
|
|
: " vlineto" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) ||
|
2001-01-03 01:15:00 +01:00
|
|
|
check_points( builder, num_args ) )
|
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
while (args < decoder->top )
|
|
|
|
{
|
|
|
|
if ( phase )
|
|
|
|
x += args[0];
|
|
|
|
else
|
|
|
|
y += args[0];
|
|
|
|
|
2002-07-26 11:09:10 +02:00
|
|
|
if ( cff_builder_add_point1( builder, x, y ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args++;
|
|
|
|
phase ^= 1;
|
|
|
|
}
|
|
|
|
args = stack;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_rrcurveto:
|
|
|
|
FT_TRACE4(( " rrcurveto" ));
|
|
|
|
|
|
|
|
/* check number of arguments; must be a multiple of 6 */
|
|
|
|
if ( num_args % 6 != 0 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
2002-07-26 11:09:10 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) ||
|
|
|
|
check_points( builder, num_args / 2 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
while ( args < decoder->top )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[2];
|
|
|
|
y += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[4];
|
|
|
|
y += args[5];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 6;
|
|
|
|
}
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_vvcurveto:
|
|
|
|
FT_TRACE4(( " vvcurveto" ));
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
if ( num_args & 1 )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
args++;
|
|
|
|
num_args--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( num_args % 4 != 0 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
|
|
|
if ( check_points( builder, 3 * ( num_args / 4 ) ) )
|
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
while ( args < decoder->top )
|
|
|
|
{
|
|
|
|
y += args[0];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[1];
|
|
|
|
y += args[2];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
y += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 4;
|
|
|
|
}
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_hhcurveto:
|
|
|
|
FT_TRACE4(( " hhcurveto" ));
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
if ( num_args & 1 )
|
|
|
|
{
|
|
|
|
y += args[0];
|
|
|
|
args++;
|
|
|
|
num_args--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( num_args % 4 != 0 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
|
|
|
if ( check_points( builder, 3 * ( num_args / 4 ) ) )
|
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
while ( args < decoder->top )
|
|
|
|
{
|
|
|
|
x += args[0];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[1];
|
|
|
|
y += args[2];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 4;
|
|
|
|
}
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_vhcurveto:
|
|
|
|
case cff_op_hvcurveto:
|
|
|
|
{
|
|
|
|
FT_Int phase;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( op == cff_op_vhcurveto ? " vhcurveto"
|
2001-01-03 08:14:12 +01:00
|
|
|
: " hvcurveto" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
if (num_args < 4 || ( num_args % 4 ) > 1 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
|
|
|
if ( check_points( builder, ( num_args / 4 ) * 3 ) )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
|
|
|
phase = ( op == cff_op_hvcurveto );
|
|
|
|
|
|
|
|
while ( num_args >= 4 )
|
|
|
|
{
|
|
|
|
num_args -= 4;
|
|
|
|
if ( phase )
|
|
|
|
{
|
|
|
|
x += args[0];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[1];
|
|
|
|
y += args[2];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
y += args[3];
|
|
|
|
if ( num_args == 1 )
|
|
|
|
x += args[4];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
y += args[0];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[1];
|
|
|
|
y += args[2];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[3];
|
|
|
|
if ( num_args == 1 )
|
|
|
|
y += args[4];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
args += 4;
|
|
|
|
phase ^= 1;
|
|
|
|
}
|
|
|
|
args = stack;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_rlinecurve:
|
|
|
|
{
|
|
|
|
FT_Int num_lines = ( num_args - 6 ) / 2;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " rlinecurve" ));
|
|
|
|
|
|
|
|
if ( num_args < 8 || ( num_args - 6 ) & 1 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
2002-07-26 11:09:10 +02:00
|
|
|
if ( cff_builder_start_point( builder, x, y ) ||
|
|
|
|
check_points( builder, num_lines + 3 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
/* first, add the line segments */
|
|
|
|
while ( num_lines > 0 )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 2;
|
|
|
|
num_lines--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* then the curve */
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[2];
|
|
|
|
y += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[4];
|
|
|
|
y += args[5];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args = stack;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_rcurveline:
|
|
|
|
{
|
|
|
|
FT_Int num_curves = ( num_args - 2 ) / 6;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " rcurveline" ));
|
|
|
|
|
|
|
|
if ( num_args < 8 || ( num_args - 2 ) % 6 )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
2002-07-26 11:09:10 +02:00
|
|
|
if ( cff_builder_start_point ( builder, x, y ) ||
|
2001-01-03 01:15:00 +01:00
|
|
|
check_points( builder, num_curves*3 + 2 ) )
|
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
/* first, add the curves */
|
|
|
|
while ( num_curves > 0 )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[2];
|
|
|
|
y += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
x += args[4];
|
|
|
|
y += args[5];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 6;
|
|
|
|
num_curves--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* then the final line */
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
args = stack;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_hflex1:
|
|
|
|
{
|
|
|
|
FT_Pos start_y;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " hflex1" ));
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
/* adding five more points; 4 control points, 1 on-curve point */
|
|
|
|
/* make sure we have enough space for the start point if it */
|
|
|
|
/* needs to be added.. */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point( builder, x, y ) ||
|
2002-07-26 11:09:10 +02:00
|
|
|
check_points( builder, 6 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
/* Record the starting point's y postion for later use */
|
|
|
|
start_y = y;
|
|
|
|
|
|
|
|
/* first control point */
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* second control point */
|
|
|
|
x += args[2];
|
|
|
|
y += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* join point; on curve, with y-value the same as the last */
|
|
|
|
/* control point's y-value */
|
|
|
|
x += args[4];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* third control point, with y-value the same as the join */
|
|
|
|
/* point's y-value */
|
|
|
|
x += args[5];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* fourth control point */
|
|
|
|
x += args[6];
|
|
|
|
y += args[7];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* ending point, with y-value the same as the start */
|
|
|
|
x += args[8];
|
|
|
|
y = start_y;
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case cff_op_hflex:
|
|
|
|
{
|
|
|
|
FT_Pos start_y;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " hflex" ));
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
/* adding six more points; 4 control points, 2 on-curve points */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point( builder, x, y ) ||
|
2002-07-26 11:09:10 +02:00
|
|
|
check_points ( builder, 6 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
/* record the starting point's y-position for later use */
|
|
|
|
start_y = y;
|
|
|
|
|
|
|
|
/* first control point */
|
|
|
|
x += args[0];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* second control point */
|
|
|
|
x += args[1];
|
|
|
|
y += args[2];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* join point; on curve, with y-value the same as the last */
|
|
|
|
/* control point's y-value */
|
|
|
|
x += args[3];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* third control point, with y-value the same as the join */
|
|
|
|
/* point's y-value */
|
|
|
|
x += args[4];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* fourth control point */
|
|
|
|
x += args[5];
|
|
|
|
y = start_y;
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* ending point, with y-value the same as the start point's */
|
|
|
|
/* y-value -- we don't add this point, though */
|
|
|
|
x += args[6];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case cff_op_flex1:
|
|
|
|
{
|
|
|
|
FT_Pos start_x, start_y; /* record start x, y values for alter */
|
|
|
|
/* use */
|
|
|
|
FT_Int dx = 0, dy = 0; /* used in horizontal/vertical */
|
|
|
|
/* algorithm below */
|
|
|
|
FT_Int horizontal, count;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " flex1" ));
|
|
|
|
|
|
|
|
/* adding six more points; 4 control points, 2 on-curve points */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point( builder, x, y ) ||
|
2002-07-26 11:09:10 +02:00
|
|
|
check_points( builder, 6 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
/* record the starting point's x, y postion for later use */
|
|
|
|
start_x = x;
|
|
|
|
start_y = y;
|
|
|
|
|
|
|
|
/* XXX: figure out whether this is supposed to be a horizontal */
|
|
|
|
/* or vertical flex; the Type 2 specification is vague... */
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
/* grab up to the last argument */
|
|
|
|
for ( count = 5; count > 0; count-- )
|
|
|
|
{
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
dx += (FT_Int)args[0];
|
|
|
|
dy += (FT_Int)args[1];
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* rewind */
|
|
|
|
args = stack;
|
|
|
|
|
|
|
|
if ( dx < 0 ) dx = -dx;
|
|
|
|
if ( dy < 0 ) dy = -dy;
|
|
|
|
|
|
|
|
/* strange test, but here it is... */
|
|
|
|
horizontal = ( dx > dy );
|
|
|
|
|
|
|
|
for ( count = 5; count > 0; count-- )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, (FT_Bool)( count == 3 ) );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* is last operand an x- or y-delta? */
|
|
|
|
if ( horizontal )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y = start_y;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
x = start_x;
|
|
|
|
y += args[0];
|
|
|
|
}
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y, 1 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
args = stack;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case cff_op_flex:
|
|
|
|
{
|
|
|
|
FT_UInt count;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " flex" ));
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
if ( cff_builder_start_point( builder, x, y ) ||
|
2002-07-26 11:09:10 +02:00
|
|
|
check_points( builder, 6 ) )
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Memory_Error;
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
for ( count = 6; count > 0; count-- )
|
|
|
|
{
|
|
|
|
x += args[0];
|
|
|
|
y += args[1];
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_add_point( builder, x, y,
|
2002-07-26 11:09:10 +02:00
|
|
|
(FT_Bool)( count == 3 || count == 0 ) );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
args = stack;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_endchar:
|
|
|
|
FT_TRACE4(( " endchar" ));
|
|
|
|
|
|
|
|
/* We are going to emulate the seac operator. */
|
|
|
|
if ( num_args == 4 )
|
|
|
|
{
|
2001-01-03 08:14:12 +01:00
|
|
|
error = cff_operator_seac( decoder,
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
args[0] >> 16,
|
|
|
|
args[1] >> 16,
|
|
|
|
(FT_Int)( args[2] >> 16 ),
|
|
|
|
(FT_Int)( args[3] >> 16 ) );
|
2001-01-03 01:15:00 +01:00
|
|
|
args += 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !error )
|
|
|
|
error = CFF_Err_Ok;
|
|
|
|
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_close_contour( builder );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
/* close hints recording session */
|
|
|
|
if ( hinter )
|
|
|
|
{
|
2001-12-16 09:17:33 +01:00
|
|
|
if (hinter->close( hinter->hints, builder->current->n_points ) )
|
2001-12-12 17:07:29 +01:00
|
|
|
goto Syntax_Error;
|
2001-12-14 15:52:58 +01:00
|
|
|
|
2001-12-12 17:07:29 +01:00
|
|
|
/* apply hints to the loaded glyph outline now */
|
|
|
|
hinter->apply( hinter->hints,
|
|
|
|
builder->current,
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
(PSH_Globals)builder->hints_globals,
|
|
|
|
builder->hint_flags );
|
2001-12-12 17:07:29 +01:00
|
|
|
}
|
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
/* add current outline to the glyph slot */
|
|
|
|
FT_GlyphLoader_Add( builder->loader );
|
|
|
|
|
|
|
|
/* return now! */
|
|
|
|
FT_TRACE4(( "\n\n" ));
|
|
|
|
return error;
|
|
|
|
|
|
|
|
case cff_op_abs:
|
|
|
|
FT_TRACE4(( " abs" ));
|
|
|
|
|
|
|
|
if ( args[0] < 0 )
|
|
|
|
args[0] = -args[0];
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_add:
|
|
|
|
FT_TRACE4(( " add" ));
|
|
|
|
|
|
|
|
args[0] += args[1];
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_sub:
|
|
|
|
FT_TRACE4(( " sub" ));
|
|
|
|
|
|
|
|
args[0] -= args[1];
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_div:
|
|
|
|
FT_TRACE4(( " div" ));
|
|
|
|
|
|
|
|
args[0] = FT_DivFix( args[0], args[1] );
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_neg:
|
|
|
|
FT_TRACE4(( " neg" ));
|
|
|
|
|
|
|
|
args[0] = -args[0];
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_random:
|
|
|
|
{
|
2002-04-14 02:54:32 +02:00
|
|
|
FT_Fixed Rand;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " rand" ));
|
|
|
|
|
2002-04-14 02:54:32 +02:00
|
|
|
Rand = seed;
|
|
|
|
if ( Rand >= 0x8000 )
|
|
|
|
Rand++;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2002-04-14 02:54:32 +02:00
|
|
|
args[0] = Rand;
|
2001-01-03 01:15:00 +01:00
|
|
|
seed = FT_MulFix( seed, 0x10000L - seed );
|
|
|
|
if ( seed == 0 )
|
|
|
|
seed += 0x2873;
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_mul:
|
|
|
|
FT_TRACE4(( " mul" ));
|
|
|
|
|
|
|
|
args[0] = FT_MulFix( args[0], args[1] );
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_sqrt:
|
|
|
|
FT_TRACE4(( " sqrt" ));
|
|
|
|
|
|
|
|
if ( args[0] > 0 )
|
|
|
|
{
|
|
|
|
FT_Int count = 9;
|
|
|
|
FT_Fixed root = args[0];
|
|
|
|
FT_Fixed new_root;
|
|
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
2001-03-16 14:35:56 +01:00
|
|
|
new_root = ( root + FT_DivFix( args[0], root ) + 1 ) >> 1;
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( new_root == root || count <= 0 )
|
|
|
|
break;
|
|
|
|
root = new_root;
|
|
|
|
}
|
|
|
|
args[0] = new_root;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
args[0] = 0;
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_drop:
|
|
|
|
/* nothing */
|
|
|
|
FT_TRACE4(( " drop" ));
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_exch:
|
|
|
|
{
|
|
|
|
FT_Fixed tmp;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " exch" ));
|
|
|
|
|
|
|
|
tmp = args[0];
|
|
|
|
args[0] = args[1];
|
|
|
|
args[1] = tmp;
|
|
|
|
args += 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_index:
|
|
|
|
{
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
FT_Int idx = (FT_Int)( args[0] >> 16 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " index" ));
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx < 0 )
|
|
|
|
idx = 0;
|
|
|
|
else if ( idx > num_args - 2 )
|
|
|
|
idx = num_args - 2;
|
|
|
|
args[0] = args[-( idx + 1 )];
|
2001-01-03 01:15:00 +01:00
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_roll:
|
|
|
|
{
|
|
|
|
FT_Int count = (FT_Int)( args[0] >> 16 );
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int idx = (FT_Int)( args[1] >> 16 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " roll" ));
|
|
|
|
|
|
|
|
if ( count <= 0 )
|
|
|
|
count = 1;
|
|
|
|
|
|
|
|
args -= count;
|
|
|
|
if ( args < stack )
|
|
|
|
goto Stack_Underflow;
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx >= 0 )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
while ( idx > 0 )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Fixed tmp = args[count - 1];
|
|
|
|
FT_Int i;
|
|
|
|
|
|
|
|
|
|
|
|
for ( i = count - 2; i >= 0; i-- )
|
|
|
|
args[i + 1] = args[i];
|
|
|
|
args[0] = tmp;
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
idx--;
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
while ( idx < 0 )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
|
|
|
FT_Fixed tmp = args[0];
|
|
|
|
FT_Int i;
|
|
|
|
|
|
|
|
|
|
|
|
for ( i = 0; i < count - 1; i++ )
|
|
|
|
args[i] = args[i + 1];
|
|
|
|
args[count - 1] = tmp;
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
idx++;
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
args += count;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_dup:
|
|
|
|
FT_TRACE4(( " dup" ));
|
|
|
|
|
|
|
|
args[1] = args[0];
|
|
|
|
args++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_put:
|
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Fixed val = args[0];
|
|
|
|
FT_Int idx = (FT_Int)( args[1] >> 16 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " put" ));
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx >= 0 && idx < decoder->len_buildchar )
|
|
|
|
decoder->buildchar[idx] = val;
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_get:
|
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int idx = (FT_Int)( args[0] >> 16 );
|
|
|
|
FT_Fixed val = 0;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " get" ));
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx >= 0 && idx < decoder->len_buildchar )
|
|
|
|
val = decoder->buildchar[idx];
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
args[0] = val;
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_store:
|
|
|
|
FT_TRACE4(( " store "));
|
|
|
|
|
|
|
|
goto Unimplemented;
|
|
|
|
|
|
|
|
case cff_op_load:
|
|
|
|
FT_TRACE4(( " load" ));
|
|
|
|
|
|
|
|
goto Unimplemented;
|
|
|
|
|
2001-03-20 12:14:24 +01:00
|
|
|
case cff_op_dotsection:
|
* builds/win32/detekt.mk: Fix .PHONY target for Intel compiler.
Renamed "ftnames.h" to "ftsnames.h", and FT_NAMES_H to
FT_SFNT_NAMES_H.
* docs/docmaker.py: Added generation of INDEX link in table of
contents.
* INSTALL, docs/BUILD: Updated documentation to indicate that the
compilation process has changed slightly (no more `src' required in
* builds/*/*-def.mk: Changed the objects directory from "obj" to
"objs".
* include/freetype/config/ftheader.h: Removed obsolete macros like
FT_SOURCE_FILE, etc. and added cache-specific macro definitions that
were previously defined in <freetype/ftcache.h>. Added comments to
be included in a new API Reference section.
* src/*/*: Removed the use of FT_SOURCE_FILE, etc. Now, each
component needs to add its own directory to the include path at
compile time. Modified all "rules.mk" and "descrip.mms"
accordingly.
* src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c,
src/type1/t1load.c, src/type1/t1objs.c: Added a few casts to remove
compiler warnings in pedantic modes.
* include/config/ft2build.h, include/config/ftheader.h: The file
top-level <ft2build.h>.
* include/config/ftheader.h: Added new section describing the #include
macros.
the Type 2 glyph charstring (used by conversion programs).
* docs/docmaker.py: Added cross-references generation as well as
seac emulation provided by the Type 2 endchar operator.
* src/cid/cidafm.c, src/cid/cidafm.h: removed un-needed files,
Added support for clipped direct rendering in the smooth renderer.
* src/cff/t2objs.c (T2_Init_Face): For pure CFF fonts, set
2001-03-20 23:58:56 +01:00
|
|
|
/* this operator is deprecated and ignored by the parser */
|
|
|
|
FT_TRACE4(( " dotsection" ));
|
2001-03-20 12:14:24 +01:00
|
|
|
break;
|
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
case cff_op_and:
|
|
|
|
{
|
|
|
|
FT_Fixed cond = args[0] && args[1];
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " and" ));
|
|
|
|
|
|
|
|
args[0] = cond ? 0x10000L : 0;
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_or:
|
|
|
|
{
|
|
|
|
FT_Fixed cond = args[0] || args[1];
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " or" ));
|
|
|
|
|
|
|
|
args[0] = cond ? 0x10000L : 0;
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_eq:
|
|
|
|
{
|
|
|
|
FT_Fixed cond = !args[0];
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " eq" ));
|
|
|
|
|
|
|
|
args[0] = cond ? 0x10000L : 0;
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_ifelse:
|
|
|
|
{
|
|
|
|
FT_Fixed cond = (args[2] <= args[3]);
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( " ifelse" ));
|
|
|
|
|
|
|
|
if ( !cond )
|
|
|
|
args[0] = args[1];
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_callsubr:
|
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_UInt idx = (FT_UInt)( ( args[0] >> 16 ) +
|
|
|
|
decoder->locals_bias );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_TRACE4(( " callsubr(%d)", idx ));
|
2001-01-03 01:15:00 +01:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx >= decoder->num_locals )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
FT_ERROR(( " invalid local subr index\n" ));
|
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( zone - decoder->zones >= CFF_MAX_SUBRS_CALLS )
|
|
|
|
{
|
2002-07-26 11:09:10 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:"
|
|
|
|
" too many nested subrs\n" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
zone->cursor = ip; /* save current instruction pointer */
|
|
|
|
|
|
|
|
zone++;
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
zone->base = decoder->locals[idx];
|
|
|
|
zone->limit = decoder->locals[idx + 1];
|
2001-01-03 01:15:00 +01:00
|
|
|
zone->cursor = zone->base;
|
|
|
|
|
|
|
|
if ( !zone->base )
|
|
|
|
{
|
2002-07-26 11:09:10 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:"
|
|
|
|
" invoking empty subrs!\n" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder->zone = zone;
|
|
|
|
ip = zone->base;
|
|
|
|
limit = zone->limit;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_callgsubr:
|
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_UInt idx = (FT_UInt)( ( args[0] >> 16 ) +
|
|
|
|
decoder->globals_bias );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_TRACE4(( " callgsubr(%d)", idx ));
|
2001-01-03 01:15:00 +01:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx >= decoder->num_globals )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
FT_ERROR(( " invalid global subr index\n" ));
|
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( zone - decoder->zones >= CFF_MAX_SUBRS_CALLS )
|
|
|
|
{
|
2002-07-26 11:09:10 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:"
|
|
|
|
" too many nested subrs\n" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
zone->cursor = ip; /* save current instruction pointer */
|
|
|
|
|
|
|
|
zone++;
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
zone->base = decoder->globals[idx];
|
|
|
|
zone->limit = decoder->globals[idx + 1];
|
2001-01-03 01:15:00 +01:00
|
|
|
zone->cursor = zone->base;
|
|
|
|
|
|
|
|
if ( !zone->base )
|
|
|
|
{
|
2002-07-26 11:09:10 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:"
|
|
|
|
" invoking empty subrs!\n" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder->zone = zone;
|
|
|
|
ip = zone->base;
|
|
|
|
limit = zone->limit;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cff_op_return:
|
|
|
|
FT_TRACE4(( " return" ));
|
|
|
|
|
|
|
|
if ( decoder->zone <= decoder->zones )
|
|
|
|
{
|
2002-07-26 11:09:10 +02:00
|
|
|
FT_ERROR(( "cff_decoder_parse_charstrings:"
|
|
|
|
" unexpected return\n" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
goto Syntax_Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder->zone--;
|
|
|
|
zone = decoder->zone;
|
|
|
|
ip = zone->cursor;
|
|
|
|
limit = zone->limit;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
Unimplemented:
|
|
|
|
FT_ERROR(( "Unimplemented opcode: %d", ip[-1] ));
|
|
|
|
|
|
|
|
if ( ip[-1] == 12 )
|
|
|
|
FT_ERROR(( " %d", ip[0] ));
|
|
|
|
FT_ERROR(( "\n" ));
|
|
|
|
|
|
|
|
return CFF_Err_Unimplemented_Feature;
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder->top = args;
|
|
|
|
|
|
|
|
} /* general operator processing */
|
|
|
|
|
|
|
|
} /* while ip < limit */
|
|
|
|
|
|
|
|
FT_TRACE4(( "..end..\n\n" ));
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
|
|
|
Syntax_Error:
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_TRACE4(( "cff_decoder_parse_charstrings: syntax error!" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
return CFF_Err_Invalid_File_Format;
|
|
|
|
|
|
|
|
Stack_Underflow:
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_TRACE4(( "cff_decoder_parse_charstrings: stack underflow!" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
return CFF_Err_Too_Few_Arguments;
|
|
|
|
|
|
|
|
Stack_Overflow:
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
FT_TRACE4(( "cff_decoder_parse_charstrings: stack overflow!" ));
|
2001-01-03 01:15:00 +01:00
|
|
|
return CFF_Err_Stack_Overflow;
|
|
|
|
|
|
|
|
Memory_Error:
|
|
|
|
return builder->error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/********** *********/
|
|
|
|
/********** *********/
|
|
|
|
/********** COMPUTE THE MAXIMUM ADVANCE WIDTH *********/
|
|
|
|
/********** *********/
|
|
|
|
/********** The following code is in charge of computing *********/
|
|
|
|
/********** the maximum advance width of the font. It *********/
|
|
|
|
/********** quickly processes each glyph charstring to *********/
|
|
|
|
/********** extract the value from either a `sbw' or `seac' *********/
|
|
|
|
/********** operator. *********/
|
|
|
|
/********** *********/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
#if 0 /* unused until we support pure CFF fonts */
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_compute_max_advance( TT_Face face,
|
2001-06-27 21:46:12 +02:00
|
|
|
FT_Int* max_advance )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Error error = 0;
|
2001-01-03 01:15:00 +01:00
|
|
|
CFF_Decoder decoder;
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Int glyph_index;
|
2002-03-30 17:41:09 +01:00
|
|
|
CFF_Font cff = (CFF_Font)face->other;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
*max_advance = 0;
|
|
|
|
|
|
|
|
/* Initialize load decoder */
|
2002-08-28 00:34:20 +02:00
|
|
|
cff_decoder_init( &decoder, face, 0, 0, 0, 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
decoder.builder.metrics_only = 1;
|
|
|
|
decoder.builder.load_points = 0;
|
|
|
|
|
|
|
|
/* For each glyph, parse the glyph charstring and extract */
|
|
|
|
/* the advance width. */
|
|
|
|
for ( glyph_index = 0; glyph_index < face->root.num_glyphs;
|
|
|
|
glyph_index++ )
|
|
|
|
{
|
|
|
|
FT_Byte* charstring;
|
|
|
|
FT_ULong charstring_len;
|
|
|
|
|
|
|
|
|
|
|
|
/* now get load the unscaled outline */
|
2002-08-15 14:10:48 +02:00
|
|
|
error = cff_get_glyph_data( face, glyph_index,
|
|
|
|
&charstring, &charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( !error )
|
|
|
|
{
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_decoder_prepare( &decoder, glyph_index );
|
2002-07-26 11:09:10 +02:00
|
|
|
error = cff_decoder_parse_charstrings( &decoder,
|
|
|
|
charstring, charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
cff_free_glyph_data( face, &charstring, &charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ignore the error if one has occurred -- skip to next glyph */
|
|
|
|
error = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*max_advance = decoder.builder.advance.x;
|
|
|
|
|
|
|
|
return CFF_Err_Ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endif /* 0 */
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/********** *********/
|
|
|
|
/********** *********/
|
|
|
|
/********** UNHINTED GLYPH LOADER *********/
|
|
|
|
/********** *********/
|
|
|
|
/********** The following code is in charge of loading a *********/
|
|
|
|
/********** single outline. It completely ignores hinting *********/
|
|
|
|
/********** and is used when FT_LOAD_NO_HINTING is set. *********/
|
|
|
|
/********** *********/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_slot_load( CFF_GlyphSlot glyph,
|
|
|
|
CFF_Size size,
|
|
|
|
FT_Int glyph_index,
|
2002-08-28 00:34:20 +02:00
|
|
|
FT_Int32 load_flags )
|
2001-01-03 01:15:00 +01:00
|
|
|
{
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Error error;
|
2001-01-03 01:15:00 +01:00
|
|
|
CFF_Decoder decoder;
|
2001-01-03 08:14:12 +01:00
|
|
|
TT_Face face = (TT_Face)glyph->root.face;
|
|
|
|
FT_Bool hinting;
|
2002-03-30 17:41:09 +01:00
|
|
|
CFF_Font cff = (CFF_Font)face->extra.data;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2001-01-03 08:14:12 +01:00
|
|
|
FT_Matrix font_matrix;
|
|
|
|
FT_Vector font_offset;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
if ( load_flags & FT_LOAD_NO_RECURSE )
|
|
|
|
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
|
|
|
|
|
|
|
|
glyph->x_scale = 0x10000L;
|
|
|
|
glyph->y_scale = 0x10000L;
|
|
|
|
if ( size )
|
|
|
|
{
|
|
|
|
glyph->x_scale = size->metrics.x_scale;
|
|
|
|
glyph->y_scale = size->metrics.y_scale;
|
|
|
|
}
|
|
|
|
|
|
|
|
glyph->root.outline.n_points = 0;
|
|
|
|
glyph->root.outline.n_contours = 0;
|
|
|
|
|
2001-06-19 10:28:24 +02:00
|
|
|
hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE ) == 0 &&
|
|
|
|
( load_flags & FT_LOAD_NO_HINTING ) == 0 );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
glyph->root.format = FT_GLYPH_FORMAT_OUTLINE; /* by default */
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
{
|
|
|
|
FT_Byte* charstring;
|
|
|
|
FT_ULong charstring_len;
|
|
|
|
|
|
|
|
|
2002-08-28 00:34:20 +02:00
|
|
|
cff_decoder_init( &decoder, face, size, glyph, hinting,
|
|
|
|
FT_LOAD_TARGET_MODE(load_flags) );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
decoder.builder.no_recurse =
|
|
|
|
(FT_Bool)( ( load_flags & FT_LOAD_NO_RECURSE ) != 0 );
|
|
|
|
|
|
|
|
/* now load the unscaled outline */
|
2002-08-15 14:10:48 +02:00
|
|
|
error = cff_get_glyph_data( face, glyph_index,
|
|
|
|
&charstring, &charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
if ( !error )
|
|
|
|
{
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_decoder_prepare( &decoder, glyph_index );
|
2002-07-26 11:09:10 +02:00
|
|
|
error = cff_decoder_parse_charstrings( &decoder,
|
|
|
|
charstring, charstring_len );
|
2001-01-03 01:15:00 +01:00
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
cff_free_glyph_data( face, &charstring, charstring_len );
|
|
|
|
|
2001-03-05 17:22:25 +01:00
|
|
|
|
2002-08-15 14:10:48 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
2002-09-05 17:10:54 +02:00
|
|
|
/* Control data and length may not be available for incremental */
|
2002-08-15 14:10:48 +02:00
|
|
|
/* fonts. */
|
|
|
|
if ( face->root.internal->incremental_interface )
|
|
|
|
{
|
|
|
|
glyph->root.control_data = 0;
|
|
|
|
glyph->root.control_len = 0;
|
|
|
|
}
|
|
|
|
else
|
2002-08-16 01:07:18 +02:00
|
|
|
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
|
|
|
|
|
2001-03-05 17:22:25 +01:00
|
|
|
/* We set control_data and control_len if charstrings is loaded. */
|
2002-07-26 11:09:10 +02:00
|
|
|
/* See how charstring loads at cff_index_access_element() in */
|
|
|
|
/* cffload.c. */
|
2002-08-15 14:10:48 +02:00
|
|
|
{
|
2002-09-05 17:10:54 +02:00
|
|
|
CFF_IndexRec csindex = cff->charstrings_index;
|
|
|
|
|
|
|
|
|
|
|
|
glyph->root.control_data =
|
|
|
|
csindex.bytes + csindex.offsets[glyph_index] - 1;
|
|
|
|
glyph->root.control_len =
|
|
|
|
charstring_len;
|
2002-08-15 14:10:48 +02:00
|
|
|
}
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* save new glyph tables */
|
* src/cff/cffcmap.c, src/cff/cffcmap.h, Jamfile, rules.mk: new files added
to support charmaps for CFF fonts
* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/cff/cffparse.c, src/cffparse.h, src/cff/cffgload.c,
src/cff/cffgload.h: adding support for CFF charmaps, reformatting the
sources, and removing some bugs in the Encoding and Charset loaders
2002-07-10 18:52:06 +02:00
|
|
|
cff_builder_done( &decoder.builder );
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
2003-02-13 18:49:27 +01:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
|
|
|
|
|
|
|
/* Incremental fonts can optionally override the metrics. */
|
2003-04-23 08:47:12 +02:00
|
|
|
if ( !error &&
|
|
|
|
face->root.internal->incremental_interface &&
|
2003-02-13 18:49:27 +01:00
|
|
|
face->root.internal->incremental_interface->funcs->get_glyph_metrics )
|
|
|
|
{
|
|
|
|
FT_Incremental_MetricsRec metrics;
|
|
|
|
|
2003-04-23 08:47:12 +02:00
|
|
|
|
2003-02-13 18:49:27 +01:00
|
|
|
metrics.bearing_x = decoder.builder.left_bearing.x;
|
|
|
|
metrics.bearing_y = decoder.builder.left_bearing.y;
|
|
|
|
metrics.advance = decoder.builder.advance.x;
|
|
|
|
error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
|
|
|
|
face->root.internal->incremental_interface->object,
|
|
|
|
glyph_index, FALSE, &metrics );
|
|
|
|
decoder.builder.left_bearing.x = metrics.bearing_x;
|
|
|
|
decoder.builder.left_bearing.y = metrics.bearing_y;
|
|
|
|
decoder.builder.advance.x = metrics.advance;
|
|
|
|
decoder.builder.advance.y = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
|
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
font_matrix = cff->top_font.font_dict.font_matrix;
|
|
|
|
font_offset = cff->top_font.font_dict.font_offset;
|
|
|
|
|
|
|
|
/* Now, set the metrics -- this is rather simple, as */
|
|
|
|
/* the left side bearing is the xMin, and the top side */
|
|
|
|
/* bearing the yMax. */
|
|
|
|
if ( !error )
|
|
|
|
{
|
|
|
|
/* For composite glyphs, return only left side bearing and */
|
|
|
|
/* advance width. */
|
|
|
|
if ( load_flags & FT_LOAD_NO_RECURSE )
|
|
|
|
{
|
|
|
|
FT_Slot_Internal internal = glyph->root.internal;
|
2001-06-28 19:49:10 +02:00
|
|
|
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x;
|
|
|
|
glyph->root.metrics.horiAdvance = decoder.glyph_width;
|
|
|
|
internal->glyph_matrix = font_matrix;
|
|
|
|
internal->glyph_delta = font_offset;
|
|
|
|
internal->glyph_transformed = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_BBox cbox;
|
|
|
|
FT_Glyph_Metrics* metrics = &glyph->root.metrics;
|
|
|
|
|
|
|
|
|
|
|
|
/* copy the _unscaled_ advance width */
|
|
|
|
metrics->horiAdvance = decoder.glyph_width;
|
|
|
|
glyph->root.linearHoriAdvance = decoder.glyph_width;
|
|
|
|
glyph->root.internal->glyph_transformed = 0;
|
|
|
|
|
|
|
|
/* make up vertical metrics */
|
|
|
|
metrics->vertBearingX = 0;
|
|
|
|
metrics->vertBearingY = 0;
|
|
|
|
metrics->vertAdvance = 0;
|
|
|
|
|
|
|
|
glyph->root.linearVertAdvance = 0;
|
|
|
|
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
glyph->root.format = FT_GLYPH_FORMAT_OUTLINE;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
glyph->root.outline.flags = 0;
|
|
|
|
if ( size && size->metrics.y_ppem < 24 )
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
glyph->root.outline.flags |= FT_OUTLINE_HIGH_PRECISION;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL;
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
/* apply the font matrix */
|
|
|
|
FT_Outline_Transform( &glyph->root.outline, &font_matrix );
|
|
|
|
|
|
|
|
FT_Outline_Translate( &glyph->root.outline,
|
|
|
|
font_offset.x,
|
|
|
|
font_offset.y );
|
|
|
|
|
|
|
|
if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
|
|
|
|
{
|
|
|
|
/* scale the outline and the metrics */
|
|
|
|
FT_Int n;
|
|
|
|
FT_Outline* cur = &glyph->root.outline;
|
|
|
|
FT_Vector* vec = cur->points;
|
|
|
|
FT_Fixed x_scale = glyph->x_scale;
|
|
|
|
FT_Fixed y_scale = glyph->y_scale;
|
|
|
|
|
|
|
|
|
|
|
|
/* First of all, scale the points */
|
2001-12-20 14:14:18 +01:00
|
|
|
if ( !hinting )
|
|
|
|
for ( n = cur->n_points; n > 0; n--, vec++ )
|
|
|
|
{
|
|
|
|
vec->x = FT_MulFix( vec->x, x_scale );
|
|
|
|
vec->y = FT_MulFix( vec->y, y_scale );
|
|
|
|
}
|
2001-01-03 01:15:00 +01:00
|
|
|
|
|
|
|
FT_Outline_Get_CBox( &glyph->root.outline, &cbox );
|
|
|
|
|
|
|
|
/* Then scale the metrics */
|
|
|
|
metrics->horiAdvance = FT_MulFix( metrics->horiAdvance, x_scale );
|
|
|
|
metrics->vertAdvance = FT_MulFix( metrics->vertAdvance, y_scale );
|
|
|
|
|
|
|
|
metrics->vertBearingX = FT_MulFix( metrics->vertBearingX, x_scale );
|
|
|
|
metrics->vertBearingY = FT_MulFix( metrics->vertBearingY, y_scale );
|
2001-12-14 15:52:58 +01:00
|
|
|
|
|
|
|
if ( hinting )
|
|
|
|
{
|
2002-03-30 17:41:09 +01:00
|
|
|
metrics->horiAdvance = ( metrics->horiAdvance + 32 ) & -64;
|
|
|
|
metrics->vertAdvance = ( metrics->vertAdvance + 32 ) & -64;
|
2001-12-14 15:52:58 +01:00
|
|
|
|
2001-12-16 09:17:33 +01:00
|
|
|
metrics->vertBearingX = ( metrics->vertBearingX + 32 ) & -64;
|
|
|
|
metrics->vertBearingY = ( metrics->vertBearingY + 32 ) & -64;
|
2001-12-14 15:52:58 +01:00
|
|
|
}
|
2001-01-03 01:15:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* compute the other metrics */
|
|
|
|
FT_Outline_Get_CBox( &glyph->root.outline, &cbox );
|
|
|
|
|
|
|
|
/* grid fit the bounding box if necessary */
|
|
|
|
if ( hinting )
|
|
|
|
{
|
|
|
|
cbox.xMin &= -64;
|
|
|
|
cbox.yMin &= -64;
|
|
|
|
cbox.xMax = ( cbox.xMax + 63 ) & -64;
|
|
|
|
cbox.yMax = ( cbox.yMax + 63 ) & -64;
|
|
|
|
}
|
|
|
|
|
|
|
|
metrics->width = cbox.xMax - cbox.xMin;
|
|
|
|
metrics->height = cbox.yMax - cbox.yMin;
|
|
|
|
|
|
|
|
metrics->horiBearingX = cbox.xMin;
|
|
|
|
metrics->horiBearingY = cbox.yMax;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* END */
|