From 42f28ab8e374137fe3f5d25424489d879d4724f8 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 21 Jun 2017 19:06:17 -0700
Subject: Updating server dependancies (#6712)

---
 vendor/golang.org/x/image/font/sfnt/postscript.go | 41 ++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

(limited to 'vendor/golang.org/x/image/font/sfnt/postscript.go')

diff --git a/vendor/golang.org/x/image/font/sfnt/postscript.go b/vendor/golang.org/x/image/font/sfnt/postscript.go
index 7c5db789d..b686e60ac 100644
--- a/vendor/golang.org/x/image/font/sfnt/postscript.go
+++ b/vendor/golang.org/x/image/font/sfnt/postscript.go
@@ -969,7 +969,8 @@ var psOperators = [...][2][]psOperator{
 		31: {-1, "hvcurveto", t2CHvcurveto},
 	}, {
 		// 2-byte operators. The first byte is the escape byte.
-		0: {}, // Reserved.
+		34: {+7, "hflex", t2CHflex},
+		36: {+9, "hflex1", t2CHflex1},
 		// TODO: more operators.
 	}},
 }
@@ -1271,6 +1272,44 @@ func t2CRrcurveto(p *psInterpreter) error {
 	return nil
 }
 
+// For the flex operators, we ignore the flex depth and always produce cubic
+// segments, not linear segments. It's not obvious why the Type 2 Charstring
+// format cares about switching behavior based on a metric in pixels, not in
+// ideal font units. The Go vector rasterizer has no problems with almost
+// linear cubic segments.
+
+func t2CHflex(p *psInterpreter) error {
+	p.type2Charstrings.cubeTo(
+		p.argStack.a[0], 0,
+		p.argStack.a[1], +p.argStack.a[2],
+		p.argStack.a[3], 0,
+	)
+	p.type2Charstrings.cubeTo(
+		p.argStack.a[4], 0,
+		p.argStack.a[5], -p.argStack.a[2],
+		p.argStack.a[6], 0,
+	)
+	return nil
+}
+
+func t2CHflex1(p *psInterpreter) error {
+	dy1 := p.argStack.a[1]
+	dy2 := p.argStack.a[3]
+	dy5 := p.argStack.a[7]
+	dy6 := -dy1 - dy2 - dy5
+	p.type2Charstrings.cubeTo(
+		p.argStack.a[0], dy1,
+		p.argStack.a[2], dy2,
+		p.argStack.a[4], 0,
+	)
+	p.type2Charstrings.cubeTo(
+		p.argStack.a[5], 0,
+		p.argStack.a[6], dy5,
+		p.argStack.a[8], dy6,
+	)
+	return nil
+}
+
 // subrBias returns the subroutine index bias as per 5177.Type2.pdf section 4.7
 // "Subroutine Operators".
 func subrBias(numSubroutines int) int32 {
-- 
cgit v1.2.3-1-g7c22