summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c
index 774f302d95b..e56cc7a0092 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/nowakowskittfinstr.c
@@ -382,8 +382,7 @@ static int GetBlueScale(SplineFont *sf) {
char *str, *end;
double bs;
int result;
-
- if ( sf->private==NULL)
+ if ( sf->private==NULL || (str=PSDictHasEntry(sf->private,"BlueScale"))==NULL )
return 42;
bs = strtod(str, &end);
@@ -4383,11 +4382,9 @@ return( false );
static uint8 *FixDStemPoint ( InstrCt *ct,StemData *stem,
int pt,int refpt,int firstedge,int cvt,BasePoint *fv ) {
uint8 *instrs, *touched;
- int ptcnt;
DiagPointInfo *diagpts;
diagpts = ct->diagpts;
- ptcnt = ct->gd->realcnt;
touched = ct->touched;
instrs = ct->pt;
@@ -4494,7 +4491,7 @@ return( instrs );
* line's starting point without special exceptions.
*/
static uint8 *FixDstem( InstrCt *ct, StemData *ds, BasePoint *fv ) {
- int startnum, a1, a2, b1, b2, ptcnt, firstedge, cvt;
+ int startnum, a1, a2, b1, b2, firstedge, cvt;
int x_ldup, y_ldup, x_edup, y_edup, dsc1, dsc2;
PointData *v1, *v2;
uint8 *touched;
@@ -4503,7 +4500,6 @@ static uint8 *FixDstem( InstrCt *ct, StemData *ds, BasePoint *fv ) {
if ( ds->ldone && ds->rdone )
return( ct->pt );
- ptcnt = ct->ptcnt;
touched = ct->touched;
dsc1 = DStemHasSnappableCorners( ct,ds,ds->keypts[0],ds->keypts[2] );
@@ -4590,12 +4586,10 @@ static uint8 *FixPointOnLine ( DiagPointInfo *diagpts,PointVector *line,
uint8 *instrs, *touched;
BasePoint newpv;
- int ptcnt;
int pushpts[4];
touched = ct->touched;
instrs = ct->pt;
- ptcnt = ct->ptcnt;
newpv = GetVector( &line->pd1->base,&line->pd2->base,true );
@@ -4641,12 +4635,10 @@ static uint8 *InterpolateAlongDiag ( DiagPointInfo *diagpts,PointVector *line,
uint8 *instrs, *touched;
BasePoint newpv;
- int ptcnt;
int pushpts[3];
touched = ct->touched;
instrs = ct->pt;
- ptcnt = ct->ptcnt;
if (diagpts[pd->ttfindex].count != 1 || touched[pd->ttfindex] & ( tf_x|tf_y ) ||
diagpts[pd->ttfindex].line[0].done > 1 )
@@ -4817,13 +4809,11 @@ static uint8 *TouchDStemPoints( InstrCt *ct,BasePoint *fv ) {
int i, ptcnt, numx=0, numy=0, idx;
int *tobefixedy, *tobefixedx;
uint8 *instrs, *touched;
- DiagPointInfo *diagpts;
PointData *pd;
touched = ct->touched;
instrs = ct->pt;
ptcnt = ct->gd->pcnt;
- diagpts = ct->diagpts;
tobefixedy = calloc( ptcnt,sizeof( int ));
tobefixedx = calloc( ptcnt,sizeof( int ));