due to Data structure modification

parent 487ee75a
......@@ -137,7 +137,7 @@ class SyncCtrlObj : public HwSyncCtrlObj
DEB_CLASS_NAMESPC(DebModCamera, "SyncCtrlObj", "Frelon");
public:
SyncCtrlObj(Espia::Acq& acq, Camera& cam, BufferCtrlObj& buffer_ctrl);
SyncCtrlObj(Espia::Acq& acq, Camera& cam);
virtual ~SyncCtrlObj();
virtual bool checkTrigMode(TrigMode trig_mode);
......
......@@ -118,8 +118,7 @@ class SyncCtrlObj : HwSyncCtrlObj
%End
public:
SyncCtrlObj(Espia::Acq& acq, Frelon::Camera& cam,
Frelon::BufferCtrlObj& buffer_ctrl);
SyncCtrlObj(Espia::Acq& acq, Frelon::Camera& cam);
virtual ~SyncCtrlObj();
virtual bool checkTrigMode(TrigMode trig_mode);
......
......@@ -243,8 +243,8 @@ void BufferCtrlObj::unregisterFrameCallback(HwFrameCallback& frame_cb)
* \brief SyncCtrlObj constructor
*******************************************************************/
SyncCtrlObj::SyncCtrlObj(Acq& acq, Camera& cam, BufferCtrlObj& buffer_ctrl)
: HwSyncCtrlObj(buffer_ctrl), m_acq(acq), m_cam(cam)
SyncCtrlObj::SyncCtrlObj(Acq& acq, Camera& cam)
: HwSyncCtrlObj(), m_acq(acq), m_cam(cam)
{
DEB_CONSTRUCTOR();
}
......@@ -696,7 +696,7 @@ void ShutterCtrlObj::getCloseTime(double& shut_close_time) const
Interface::Interface(Acq& acq, BufferCtrlMgr& buffer_mgr,
Camera& cam)
: m_acq(acq), m_buffer_mgr(buffer_mgr), m_cam(cam), m_acq_end_cb(cam),
m_det_info(cam), m_buffer(buffer_mgr), m_sync(acq, cam, m_buffer),
m_det_info(cam), m_buffer(buffer_mgr), m_sync(acq, cam),
m_bin(cam), m_roi(cam), m_flip(cam), m_shutter(cam)
{
DEB_CONSTRUCTOR();
......
......@@ -121,7 +121,7 @@ void SoftRoiCallback::data2FrameInfo(Data& data, HwFrameInfoType& finfo,
Timestamp start_ts;
buffer_ctrl->getStartTimestamp(start_ts);
fdim = FrameDim(data.width, data.height, image_type);
fdim = FrameDim(data.dimensions[0], data.dimensions[1], image_type);
int valid_pixels = Point(fdim.getSize()).getArea();
finfo = HwFrameInfoType(data.frameNumber, data.data(), &fdim,
......@@ -213,8 +213,8 @@ void TestFrameCallback::frameInfo2Data(const HwFrameInfoType& frame_info,
data.frameNumber = frame_info.acq_frame_nb;
const Size &aSize = frame_info.frame_dim.getSize();
data.width = aSize.getWidth();
data.height = aSize.getHeight();
data.dimensions.push_back(aSize.getWidth());
data.dimensions.push_back(aSize.getHeight());
ImageType image_type = frame_info.frame_dim.getImageType();
switch (image_type) {
......
Markdown is supported
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