From 93b7164833fd86524f19146b1124111ebab61a2e Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Sat, 17 Aug 2019 16:29:42 -0400 Subject: [PATCH 1/2] fix VP3 trims --- pyembroidery/Vp3Reader.py | 5 +++-- pyembroidery/Vp3Writer.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pyembroidery/Vp3Reader.py b/pyembroidery/Vp3Reader.py index 8b2259e9..a9361b55 100644 --- a/pyembroidery/Vp3Reader.py +++ b/pyembroidery/Vp3Reader.py @@ -54,6 +54,8 @@ def read(f, out, settings=None): skip_vp3_string(f) # "Produced by Software Ltd" count_colors = read_int_16be(f) for i in range(0, count_colors): + if i != 0: + out.color_change() vp3_read_colorblock(f, out, center_x, center_y) @@ -94,8 +96,7 @@ def vp3_read_colorblock(f, read_object, center_x, center_y): elif y == 0x02: pass # ends long stitch mode. elif y == 0x03: - read_object.end(0, 0) - return + read_object.trim() else: read_object.stitch(x, y) read_object.trim() diff --git a/pyembroidery/Vp3Writer.py b/pyembroidery/Vp3Writer.py index 1683eea1..8a318e3b 100644 --- a/pyembroidery/Vp3Writer.py +++ b/pyembroidery/Vp3Writer.py @@ -228,11 +228,12 @@ def write_stitches_block(f, stitches, first_pos_x, first_pos_y): y = stitch[1] flags = stitch[2] if flags == END: - f.write(b'\x80\x03') + f.write(b'\x80\x03') # trim at end of file break elif flags == COLOR_CHANGE: continue elif flags == TRIM: + f.write(b'\x80\x03') continue elif flags == SEQUIN_MODE: continue From 4576ceeab262c195f2e1368cd174e7eb3becfe18 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Sat, 17 Aug 2019 16:30:01 -0400 Subject: [PATCH 2/2] version bump to 1.2.40 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a0eb2e52..d6d40503 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="pyembroidery", - version="1.2.39", + version="1.2.40", author="Tatarize", author_email="tatarize@gmail.com", description="Embroidery IO library",