joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

clip: check Path ops are not mixed with others

Browse Source 
Multiple operations Op, such as clip.Path, cannot
be interleaved with other ops. This patch adds a
mechanism to ensure that is the case by starting
multi ops with ops.BeginMulti and ending them with
ops.EndMulti while operations are written to op.Ops
with ops.WriteMulti.
This mechanism is applied to clip.Path.

Fixes: https://todo.sr.ht/~eliasnaur/gio/336
Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
Pierre Curto
2022-01-15 18:52:51 +01:00
committed by Elias Naur
parent 2879fe8b41
commit 2ce9ad36af
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
op/clip/clip.go
+7 -5
View File
@@ -126,7 +126,8 @@ func (p *Path) Begin(o *op.Ops) {
contour: 1,
}
p.hash.SetSeed(pathSeed)
data := ops.Write(p.ops, ops.TypeAuxLen)
ops.BeginMulti(p.ops)
data := ops.WriteMulti(p.ops, ops.TypeAuxLen)
data[0] = byte(ops.TypeAux)
}
@@ -134,6 +135,7 @@ func (p *Path) Begin(o *op.Ops) {
func (p *Path) End() PathSpec {
p.gap()
c := p.macro.Stop()
ops.EndMulti(p.ops)
return PathSpec{
spec: c,
hasSegments: p.hasSegments,
@@ -163,7 +165,7 @@ func (p *Path) gap() {
if p.pen != p.start {
// A closed contour starts and ends in the same point.
// This move creates a gap in the contour, register it.
data := ops.Write(p.ops, scene.CommandSize+4)
data := ops.WriteMulti(p.ops, scene.CommandSize+4)
bo := binary.LittleEndian
bo.PutUint32(data[0:], uint32(p.contour))
p.cmd(data[4:], scene.Gap(p.pen, p.start))
@@ -183,7 +185,7 @@ func (p *Path) Line(delta f32.Point) {
// LineTo moves the pen to the absolute point specified, recording a line.
func (p *Path) LineTo(to f32.Point) {
data := ops.Write(p.ops, scene.CommandSize+4)
data := ops.WriteMulti(p.ops, scene.CommandSize+4)
bo := binary.LittleEndian
bo.PutUint32(data[0:], uint32(p.contour))
p.cmd(data[4:], scene.Line(p.pen, to))
@@ -251,7 +253,7 @@ func (p *Path) Quad(ctrl, to f32.Point) {
// QuadTo records a quadratic Bézier from the pen to end
// with the control point ctrl, with absolute coordinates.
func (p *Path) QuadTo(ctrl, to f32.Point) {
data := ops.Write(p.ops, scene.CommandSize+4)
data := ops.WriteMulti(p.ops, scene.CommandSize+4)
bo := binary.LittleEndian
bo.PutUint32(data[0:], uint32(p.contour))
p.cmd(data[4:], scene.Quad(p.pen, ctrl, to))
@@ -297,7 +299,7 @@ func (p *Path) CubeTo(ctrl0, ctrl1, to f32.Point) {
if ctrl0 == p.pen && ctrl1 == p.pen && to == p.pen {
return
}
data := ops.Write(p.ops, scene.CommandSize+4)
data := ops.WriteMulti(p.ops, scene.CommandSize+4)
bo := binary.LittleEndian
bo.PutUint32(data[0:], uint32(p.contour))
p.cmd(data[4:], scene.Cubic(p.pen, ctrl0, ctrl1, to))