apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of padding after empty sequences

Browse Source
This commit is contained in:
Marko Durkovic
2022-01-06 20:35:58 +01:00
parent 8bf8994fbf
commit ac55fd2f4a
3 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rosbags/serde/cdr.py
+6 -3
View File
@@ -119,7 +119,8 @@ def generate_getsize_cdr(fields: list[Field]) -> tuple[CDRSerSize, int]:
else:
anext = align(subdesc)
if aligned < anext:
lines.append(f' pos = (pos + {anext} - 1) & -{anext}')
lines.append(f' if len(message.{fieldname}):')
lines.append(f' pos = (pos + {anext} - 1) & -{anext}')
aligned = anext
lines.append(f' pos += len(message.{fieldname}) * {SIZEMAP[subdesc.args]}')
@@ -272,7 +273,8 @@ def generate_serialize_cdr(fields: list[Field], endianess: str) -> CDRSer:
if (endianess == 'le') != (sys.byteorder == 'little'):
lines.append(' val = val.byteswap()')
if aligned < (anext := align(subdesc)):
lines.append(f' pos = (pos + {anext} - 1) & -{anext}')
lines.append(' if size:')
lines.append(f' pos = (pos + {anext} - 1) & -{anext}')
lines.append(' rawdata[pos:pos + size] = val.view(numpy.uint8)')
lines.append(' pos += size')
aligned = anext
@@ -417,7 +419,8 @@ def generate_deserialize_cdr(fields: list[Field], endianess: str) -> CDRDeser:
else:
lines.append(f' length = size * {SIZEMAP[subdesc.args]}')
if aligned < (anext := align(subdesc)):
lines.append(f' pos = (pos + {anext} - 1) & -{anext}')
lines.append(' if size:')
lines.append(f' pos = (pos + {anext} - 1) & -{anext}')
lines.append(
f' val = numpy.frombuffer(rawdata, '
f'dtype=numpy.{subdesc.args}, count=size, offset=pos)',
src/rosbags/serde/ros1.py
+4 -2
View File
@@ -151,7 +151,8 @@ def generate_ros1_to_cdr(
aligned = 1
else:
if aligned < (anext := align(subdesc)):
lines.append(f' opos = (opos + {anext} - 1) & -{anext}')
lines.append(' if size:')
lines.append(f' opos = (opos + {anext} - 1) & -{anext}')
lines.append(f' length = size * {SIZEMAP[subdesc.args]}')
if copy:
lines.append(' output[opos:opos + length] = input[ipos:ipos + length]')
@@ -304,7 +305,8 @@ def generate_cdr_to_ros1(
aligned = 1
else:
if aligned < (anext := align(subdesc)):
lines.append(f' ipos = (ipos + {anext} - 1) & -{anext}')
lines.append(' if size:')
lines.append(f' ipos = (ipos + {anext} - 1) & -{anext}')
lines.append(f' length = size * {SIZEMAP[subdesc.args]}')
if copy:
lines.append(' output[opos:opos + length] = input[ipos:ipos + length]')