Skip to content

Commit bc56add

Browse files
committed
Merge branch 'fixed-read-video-last-image' into 'master'
Fixed read video last image Closes #75 and bliss/bliss#4687 See merge request limagroup/Lima-tango-python!124
2 parents 96bd9f8 + 55cc57b commit bc56add

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

Lima/Server/LimaCCDs.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3009,11 +3009,12 @@ def _video_image_2_struct(image):
30093009
image.height(), # height
30103010
ord(struct.pack("=H", 1).decode()[-1]), # endianness
30113011
struct.calcsize(VIDEO_HEADER_FORMAT), # header size
3012-
0,
3013-
0,
3014-
) # padding
3012+
0, # padding
3013+
0, # padding
3014+
)
30153015

3016-
return videoheader + image.buffer()
3016+
data = image.buffer() or b""
3017+
return videoheader + data
30173018

30183019

30193020
def _acqstate2string(state):

0 commit comments

Comments
 (0)