From 6b0d1cd842f139af0034c59c6ae369e6cf43f939 Mon Sep 17 00:00:00 2001 From: jan Date: Mon, 12 Apr 2021 13:58:52 -0700 Subject: [PATCH] fix reading some elements --- klamath/elements.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/klamath/elements.py b/klamath/elements.py index 3b36ca2..dec76f1 100644 --- a/klamath/elements.py +++ b/klamath/elements.py @@ -338,8 +338,8 @@ class Box(Element): @classmethod def read(cls: Type[X], stream: BinaryIO) -> X: - layer = LAYER.skip_and_read(stream) - dtype = BOXTYPE.read(stream) + layer = LAYER.skip_and_read(stream)[0] + dtype = BOXTYPE.read(stream)[0] xy = XY.read(stream).reshape(-1, 2) properties = read_properties(stream) return cls(layer=(layer, dtype), xy=xy, properties=properties) @@ -372,8 +372,8 @@ class Node(Element): @classmethod def read(cls: Type[N], stream: BinaryIO) -> N: - layer = LAYER.skip_and_read(stream) - dtype = NODETYPE.read(stream) + layer = LAYER.skip_and_read(stream)[0] + dtype = NODETYPE.read(stream)[0] xy = XY.read(stream).reshape(-1, 2) properties = read_properties(stream) return cls(layer=(layer, dtype), xy=xy, properties=properties) @@ -438,8 +438,8 @@ class Text(Element): width = 0 mag = 1 angle_deg = 0 - layer = LAYER.skip_and_read(stream) - dtype = TEXTTYPE.read(stream) + layer = LAYER.skip_and_read(stream)[0] + dtype = TEXTTYPE.read(stream)[0] size, tag = Record.read_header(stream) while tag != XY.tag: