Commit 73ee6963 authored by Yuelong Yu's avatar Yuelong Yu
Browse files

fixed compilation bug

parent 17d745d6
......@@ -185,7 +185,19 @@ namespace FSDataRecvNS
m_file_name = m_file_name + "_" + chNum;
}
if(!(nx_writer->FileConfig(m_file_name,m_y,m_x)))
if(!(nx_writer->FileConfig(m_file_name,
true,
1,
m_y,
m_x,
16,
1,
false,
false,
false,
2,
false,
0)))
return false;
if(!(nx_writer->CreateFile()))
......
......@@ -117,14 +117,17 @@ namespace FSDataRecvNS
{
LOG_TRACE(__FUNCTION__);
memcpy(&m_img_data[m_packets_collected]*4096,packet_data.data,4096*sizeof(uint16_t));
memcpy(&m_img_data[m_packets_collected*4096],
packet_data.data,
4096*sizeof(uint16_t));
++m_packets_collected;
if(m_packets_collected == 16) // one image is finished
{
++m_received_imgs;
m_current_frame_number = m_received_imgs;
m_mempool16bit->WriteOneImage(m_img_data,m_received_imgs,0);
int16* data = reinterpret_cast<int16*>(&m_img_data[0]);
m_mempool16bit->SetImage(data,m_received_imgs,0);
}
}
......
......@@ -43,7 +43,7 @@ namespace FSDataRecvNS
// uint16_t roundRobin;
// uint8_t detectortype;
// uint8_t headerVersion;
uint16_t data[BUFFER_LENGTH];
uint16_t data[CHAR_BUFFER];
};
#pragma pack(pop)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment