Successful first compilation after merge

src/mynteye/api/api.cc

@@ -287,6 +287,10 @@ bool API::Supports(const AddOns &addon) const {
   return device_->Supports(addon);
 }
 
+void API::InitResolution(const Resolution &res) {
+  return device_->InitResolution(res);
+}
+
 void API::SetStreamRequest(const Format &format, const FrameRate &rate) {
   device_->SetStreamRequest(format, rate);
 }

src/mynteye/api/synthetic.cc

@@ -17,6 +17,8 @@
 #include <functional>
 #include <stdexcept>
 
+#include <opencv2/imgproc/imgproc.hpp>
+
 #include "mynteye/logger.h"
 #include "mynteye/api/object.h"
 #include "mynteye/api/plugin.h"

src/mynteye/device/channels.cc

@@ -565,7 +565,7 @@ std::size_t from_data(
 
 // TODO(Kalman): Is there a more elegant way?
 std::size_t from_data(
-    Channels::img_params_t *img_params, const std::uint8_t *data,
+    device::img_params_t *img_params, const std::uint8_t *data,
     const Version *spec_version) {
   std::size_t i = 0;
 
@@ -600,7 +600,7 @@ std::size_t from_data(
 }
 
 std::size_t from_data(
-    Channels::imu_params_t *imu_params, const std::uint8_t *data,
+    device::imu_params_t *imu_params, const std::uint8_t *data,
     const Version *spec_version) {
   std::size_t i = 0;
   i += from_data(&imu_params->in_accel, data + i, spec_version);
@@ -864,7 +864,7 @@ std::size_t to_data(
 }
 
 std::size_t to_data(
-    const Channels::img_params_t *img_params, std::uint8_t *data,
+    const device::img_params_t *img_params, std::uint8_t *data,
     const Version *spec_version) {
   std::size_t i = 3;  // skip id, size
 

src/mynteye/device/channels.h

@@ -21,6 +21,7 @@
 
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
+#include "mynteye/device/device.h"
 #include "mynteye/device/types.h"
 #include "mynteye/uvc/uvc.h"
 
@@ -67,6 +68,9 @@ class MYNTEYE_API Channels {
 
   using device_info_t = DeviceInfo;
 
+  using imu_params_t = device::imu_params_t;
+  using img_params_t = device::img_params_t;
+/*
   typedef struct ImgParams {
     bool ok;
     std::map<Resolution, Intrinsics> in_left_map;
@@ -80,7 +84,7 @@ class MYNTEYE_API Channels {
     ImuIntrinsics in_gyro;
     Extrinsics ex_left_to_imu;
   } imu_params_t;
-
+*/
   explicit Channels(std::shared_ptr<uvc::device> device);
   ~Channels();
 

src/mynteye/device/device.cc

@@ -557,8 +557,8 @@ void Device::ReadAllInfos() {
   device_info_ = std::make_shared<DeviceInfo>();
 
   CHECK_NOTNULL(channels_);
-  Channels::imu_params_t imu_params;
-  if (!channels_->GetFiles(device_info_.get(), &img_params, &imu_params)) {
+  Device::imu_params_t imu_params;
+  if (!channels_->GetFiles(device_info_.get(), &img_params_, &imu_params)) {
 #if defined(WITH_DEVICE_INFO_REQUIRED)
     LOG(FATAL)
 #else
@@ -629,7 +629,7 @@ void Device::CallbackMotionData(const device::MotionData &data) {
   }
 }
 
-Channels::img_params_t Device::GetImgParams() {
+Device::img_params_t Device::GetImgParams() {
   return img_params_;
 }