From 60d95dc0d754d74dd662ef4f3f60140974c9f8e7 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Mon, 1 May 2023 18:36:58 +0200
Subject: [PATCH] JFJochFrameSerializer: image is encoded at the very end

---
 frame_serialize/JFJochFrameSerializer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frame_serialize/JFJochFrameSerializer.cpp b/frame_serialize/JFJochFrameSerializer.cpp
index 90717bea..62e935ce 100644
--- a/frame_serialize/JFJochFrameSerializer.cpp
+++ b/frame_serialize/JFJochFrameSerializer.cpp
@@ -381,7 +381,6 @@ void JFJochFrameSerializer::SerializeImage(const DataMessage& message) {
     CBOR_ENC(mapEncoder, "series_unique_id", message.series_unique_id);
     CBOR_ENC(mapEncoder, "series_id", message.series_id);
     CBOR_ENC(mapEncoder, "image_id", message.number);
-    CBOR_ENC(mapEncoder, "data", message.image);
 
     cborErr(cbor_encode_text_stringz(&mapEncoder, "user_data"));
     cborErr(cbor_encoder_create_map(&mapEncoder, &userDataMapEncoder, 6));
@@ -394,6 +393,8 @@ void JFJochFrameSerializer::SerializeImage(const DataMessage& message) {
     CBOR_ENC(userDataMapEncoder, "timestamp", message.timestamp);
     cborErr(cbor_encoder_close_container(&mapEncoder, &userDataMapEncoder));
 
+    CBOR_ENC(mapEncoder, "data", message.image);
+
     cborErr(cbor_encoder_close_container(&encoder, &mapEncoder));
 
     buffer.resize(cbor_encoder_get_buffer_size(&encoder, buffer.data()));