From a0be1a501015481b781324059cbb0040877bd639 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Wed, 27 May 2020 14:28:50 +0200
Subject: [PATCH] Correct calculation of buffer size

---
 sf-writer/src/ImageAssembler.cpp | 7 ++++---
 sf-writer/src/ImageAssembler.hpp | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sf-writer/src/ImageAssembler.cpp b/sf-writer/src/ImageAssembler.cpp
index 3d9b6c2..329017f 100644
--- a/sf-writer/src/ImageAssembler.cpp
+++ b/sf-writer/src/ImageAssembler.cpp
@@ -4,9 +4,10 @@ using namespace std;
 using namespace core_buffer;
 
 ImageAssembler::ImageAssembler(const size_t n_modules) :
-    n_modules_(n_modules)
+    n_modules_(n_modules),
+    image_buffer_slot_n_bytes_(BUFFER_BLOCK_SIZE * MODULE_N_BYTES * n_modules_)
 {
-    image_buffer_ = new char[IA_N_SLOTS * MODULE_N_BYTES * n_modules_];
+    image_buffer_ = new char[IA_N_SLOTS * image_buffer_slot_n_bytes_];
     metadata_buffer_ = new ImageMetadataBlock[IA_N_SLOTS];
 }
 
@@ -46,5 +47,5 @@ ImageMetadataBlock* ImageAssembler::get_metadata_buffer(const int slot_id)
 
 char* ImageAssembler::get_data_buffer(const int slot_id)
 {
-    return image_buffer_ + (slot_id * MODULE_N_BYTES * n_modules_);
+    return image_buffer_ + (slot_id * image_buffer_slot_n_bytes_);
 }
diff --git a/sf-writer/src/ImageAssembler.hpp b/sf-writer/src/ImageAssembler.hpp
index d2c4540..a34cb59 100644
--- a/sf-writer/src/ImageAssembler.hpp
+++ b/sf-writer/src/ImageAssembler.hpp
@@ -7,6 +7,7 @@ const size_t IA_N_SLOTS = 2;
 
 class ImageAssembler {
     const size_t n_modules_;
+    const size_t image_buffer_slot_n_bytes_;
 
     char* image_buffer_;
     ImageMetadataBlock* metadata_buffer_;