diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-24 20:11:36 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-24 20:11:36 -0400 |
commit | f5437632f486b7d0a0a181c58f113c86d032b02c (patch) | |
tree | 407388e3003a210a89f4b2128d7ad656f8b79d26 /vendor/golang.org/x/image/font/sfnt/truetype.go | |
parent | 7f68a60f8c228d5604e0566bf84cabb145d16c37 (diff) | |
download | chat-f5437632f486b7d0a0a181c58f113c86d032b02c.tar.gz chat-f5437632f486b7d0a0a181c58f113c86d032b02c.tar.bz2 chat-f5437632f486b7d0a0a181c58f113c86d032b02c.zip |
Upgrading server dependancies (#6215)
Diffstat (limited to 'vendor/golang.org/x/image/font/sfnt/truetype.go')
-rw-r--r-- | vendor/golang.org/x/image/font/sfnt/truetype.go | 78 |
1 files changed, 22 insertions, 56 deletions
diff --git a/vendor/golang.org/x/image/font/sfnt/truetype.go b/vendor/golang.org/x/image/font/sfnt/truetype.go index 41819617d..ab27f5b2c 100644 --- a/vendor/golang.org/x/image/font/sfnt/truetype.go +++ b/vendor/golang.org/x/image/font/sfnt/truetype.go @@ -51,7 +51,7 @@ func midPoint(p, q fixed.Point26_6) fixed.Point26_6 { } } -func parseLoca(src *source, loca table, glyfOffset uint32, indexToLocFormat bool, numGlyphs int) (locations []uint32, err error) { +func parseLoca(src *source, loca table, glyfOffset uint32, indexToLocFormat bool, numGlyphs int32) (locations []uint32, err error) { if indexToLocFormat { if loca.length != 4*uint32(numGlyphs+1) { return nil, errInvalidLocaTable @@ -414,44 +414,28 @@ func (g *glyfIter) close() { case !g.firstOffCurveValid && !g.lastOffCurveValid: g.closed = true g.seg = Segment{ - Op: SegmentOpLineTo, - Args: [6]fixed.Int26_6{ - g.firstOnCurve.X, - g.firstOnCurve.Y, - }, + Op: SegmentOpLineTo, + Args: [3]fixed.Point26_6{g.firstOnCurve}, } case !g.firstOffCurveValid && g.lastOffCurveValid: g.closed = true g.seg = Segment{ - Op: SegmentOpQuadTo, - Args: [6]fixed.Int26_6{ - g.lastOffCurve.X, - g.lastOffCurve.Y, - g.firstOnCurve.X, - g.firstOnCurve.Y, - }, + Op: SegmentOpQuadTo, + Args: [3]fixed.Point26_6{g.lastOffCurve, g.firstOnCurve}, } case g.firstOffCurveValid && !g.lastOffCurveValid: g.closed = true g.seg = Segment{ - Op: SegmentOpQuadTo, - Args: [6]fixed.Int26_6{ - g.firstOffCurve.X, - g.firstOffCurve.Y, - g.firstOnCurve.X, - g.firstOnCurve.Y, - }, + Op: SegmentOpQuadTo, + Args: [3]fixed.Point26_6{g.firstOffCurve, g.firstOnCurve}, } case g.firstOffCurveValid && g.lastOffCurveValid: - mid := midPoint(g.lastOffCurve, g.firstOffCurve) g.lastOffCurveValid = false g.seg = Segment{ Op: SegmentOpQuadTo, - Args: [6]fixed.Int26_6{ - g.lastOffCurve.X, - g.lastOffCurve.Y, - mid.X, - mid.Y, + Args: [3]fixed.Point26_6{ + g.lastOffCurve, + midPoint(g.lastOffCurve, g.firstOffCurve), }, } } @@ -484,11 +468,8 @@ func (g *glyfIter) nextSegment() (ok bool) { g.firstOnCurve = p g.firstOnCurveValid = true g.seg = Segment{ - Op: SegmentOpMoveTo, - Args: [6]fixed.Int26_6{ - p.X, - p.Y, - }, + Op: SegmentOpMoveTo, + Args: [3]fixed.Point26_6{p}, } return true } else if !g.firstOffCurveValid { @@ -496,17 +477,13 @@ func (g *glyfIter) nextSegment() (ok bool) { g.firstOffCurveValid = true continue } else { - midp := midPoint(g.firstOffCurve, p) - g.firstOnCurve = midp + g.firstOnCurve = midPoint(g.firstOffCurve, p) g.firstOnCurveValid = true g.lastOffCurve = p g.lastOffCurveValid = true g.seg = Segment{ - Op: SegmentOpMoveTo, - Args: [6]fixed.Int26_6{ - midp.X, - midp.Y, - }, + Op: SegmentOpMoveTo, + Args: [3]fixed.Point26_6{g.firstOnCurve}, } return true } @@ -518,25 +495,19 @@ func (g *glyfIter) nextSegment() (ok bool) { continue } else { g.seg = Segment{ - Op: SegmentOpLineTo, - Args: [6]fixed.Int26_6{ - p.X, - p.Y, - }, + Op: SegmentOpLineTo, + Args: [3]fixed.Point26_6{p}, } return true } } else { if !g.on { - midp := midPoint(g.lastOffCurve, p) g.seg = Segment{ Op: SegmentOpQuadTo, - Args: [6]fixed.Int26_6{ - g.lastOffCurve.X, - g.lastOffCurve.Y, - midp.X, - midp.Y, + Args: [3]fixed.Point26_6{ + g.lastOffCurve, + midPoint(g.lastOffCurve, p), }, } g.lastOffCurve = p @@ -544,13 +515,8 @@ func (g *glyfIter) nextSegment() (ok bool) { return true } else { g.seg = Segment{ - Op: SegmentOpQuadTo, - Args: [6]fixed.Int26_6{ - g.lastOffCurve.X, - g.lastOffCurve.Y, - p.X, - p.Y, - }, + Op: SegmentOpQuadTo, + Args: [3]fixed.Point26_6{g.lastOffCurve, p}, } g.lastOffCurveValid = false return true |