detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-01-21 02:06:43 +01:00
Code Issues Actions Packages Releases Activity

fix merge errors

Browse Source
This commit is contained in:
Bechir
2024-03-08 18:42:24 +01:00
parent 565cad0fca
commit 5173f26bf8
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/include/aare/Frame.hpp
View File

@@ -18,13 +18,8 @@ template <class DataType> class Frame {
DataType *m_data;
ssize_t m_bitdepth = sizeof(DataType) * 8;
public:
ssize_t rows;
ssize_t cols;
DataType* data;
ssize_t bitdepth = sizeof(DataType)*8;
public:
Frame(ssize_t rows, ssize_t cols);
Frame(std::byte *fp, ssize_t rows, ssize_t cols);
DataType get(int row, int col);
ssize_t rows() const{
@@ -36,6 +31,9 @@ template <class DataType> class Frame {
ssize_t bitdepth() const{
return m_bitdepth;
}
DataType* _get_data(){
return m_data;
}
~Frame() { delete[] m_data; }
};

4
core/src/Frame.cpp
View File

@@ -10,8 +10,8 @@ Frame<DataType>::Frame(std::byte* bytes, ssize_t rows, ssize_t cols):
template <typename DataType>
Frame<DataType>::Frame(ssize_t rows, ssize_t cols):
rows(rows), cols(cols) {
data = new DataType[rows*cols];
m_rows(rows), m_cols(cols) {
m_data = new DataType[m_rows*m_cols];
}