2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix "bad char in struct format"

Browse source
This commit is contained in:
Laura Klünder 2017-10-24 13:26:25 +02:00
parent 892de944f9
commit 82a46648a1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/mapdata/cache.py
View file

@ -42,7 +42,7 @@ class MapHistory:
try:
with open(filename, 'rb') as f:
resolution, x, y, width, height, num_updates = struct.unpack('<BHHHHH', f.read(11))
updates = struct.unpack('<II'*num_updates, f.read(num_updates*8))
updates = struct.unpack('<'+'II'*num_updates, f.read(num_updates*8))
updates = list(zip(updates[0::2], updates[1::2]))
# noinspection PyTypeChecker
data = np.fromstring(f.read(width*height*2), np.uint16).reshape((height, width))
@ -58,7 +58,7 @@ class MapHistory:
with open(filename, 'wb') as f:
f.write(struct.pack('<BHHHHH', self.resolution, self.x, self.y, *reversed(self.data.shape),
len(self.updates)))
f.write(struct.pack('<II'*len(self.updates), *chain(*self.updates)))
f.write(struct.pack('<'+'II'*len(self.updates), *chain(*self.updates)))
f.write(self.data.tobytes('C'))
def add_new(self, geometry):