Fix the conflict again

src/mynteye/api/api.cc

@@ -88,15 +88,8 @@ bool dir_exists(const std::string &p) {
 #endif
 
 std::vector<std::string> get_plugin_paths() {
-<<<<<<< HEAD:src/api/api.cc
-  std::string info_path(MYNTEYE_SDK_INSTALL_DIR);
-  info_path.append(
-      MYNTEYE_OS_SEP "share" MYNTEYE_OS_SEP "mynteye" MYNTEYE_OS_SEP
-                     "build.info");
-=======
   std::string info_path = utils::get_sdk_install_dir();
   info_path.append(MYNTEYE_OS_SEP "share" MYNTEYE_OS_SEP "mynteye" MYNTEYE_OS_SEP "build.info");
->>>>>>> origin/develop:src/mynteye/api/api.cc
 
   cv::FileStorage fs(info_path, cv::FileStorage::READ);
   if (!fs.isOpened()) {
@@ -217,30 +210,7 @@ std::vector<std::string> get_plugin_paths() {
 
 API::API(std::shared_ptr<Device> device) : device_(device) {
   VLOG(2) << __func__;
-<<<<<<< HEAD:src/api/api.cc
   std::dynamic_pointer_cast<StandardDevice>(device_);
-=======
-  if (std::dynamic_pointer_cast<StandardDevice>(device_) != nullptr) {
-    bool in_l_ok, in_r_ok, ex_r2l_ok;
-    device_->GetIntrinsics(Stream::LEFT, &in_l_ok);
-    device_->GetIntrinsics(Stream::RIGHT, &in_r_ok);
-    device_->GetExtrinsics(Stream::RIGHT, Stream::LEFT, &ex_r2l_ok);
-    if (!in_l_ok || !in_r_ok || !ex_r2l_ok) {
-#if defined(WITH_DEVICE_INFO_REQUIRED)
-      LOG(FATAL)
-#else
-      LOG(WARNING)
-#endif
-          << "Image params not found, but we need it to process the "
-             "images. Please `make tools` and use `img_params_writer` "
-             "to write the image params. If you update the SDK from "
-             "1.x, the `SN*.conf` is the file contains them. Besides, "
-             "you could also calibrate them by yourself. Read the guide "
-             "doc (https://github.com/slightech/MYNT-EYE-S-SDK-Guide) "
-             "to learn more.";
-    }
-  }
->>>>>>> origin/develop:src/mynteye/api/api.cc
   synthetic_.reset(new Synthetic(this));
 }
 

src/mynteye/device/device.cc

@@ -558,11 +558,6 @@ void Device::ReadAllInfos() {
 
   CHECK_NOTNULL(channels_);
   Channels::imu_params_t imu_params;
-<<<<<<< HEAD:src/device/device.cc
-  if (!channels_->GetFiles(device_info_.get(), &img_params_, &imu_params)) {
-    LOG(FATAL) << "Read device infos failed. Please upgrade your firmware to "
-                  "the latest version.";
-=======
   if (!channels_->GetFiles(device_info_.get(), &img_params, &imu_params)) {
 #if defined(WITH_DEVICE_INFO_REQUIRED)
     LOG(FATAL)
@@ -571,7 +566,6 @@ void Device::ReadAllInfos() {
 #endif
         << "Read device infos failed. Please upgrade your firmware to the "
            "latest version.";
->>>>>>> origin/develop:src/mynteye/device/device.cc
   }
   VLOG(2) << "Device info: {name: " << device_info_->name
           << ", serial_number: " << device_info_->serial_number
@@ -585,21 +579,10 @@ void Device::ReadAllInfos() {
           << ", nominal_baseline: " << device_info_->nominal_baseline << "}";
 
   device_info_->name = uvc::get_name(*device_);
-<<<<<<< HEAD:src/device/device.cc
   if (img_params_.ok) {
     SetExtrinsics(Stream::LEFT, Stream::RIGHT, img_params_.ex_right_to_left);
     VLOG(2) << "Extrinsics left to right: {"
             << GetExtrinsics(Stream::LEFT, Stream::RIGHT) << "}";
-=======
-  if (img_params.ok) {
-    SetIntrinsics(Stream::LEFT, img_params.in_left);
-    SetIntrinsics(Stream::RIGHT, img_params.in_right);
-    SetExtrinsics(Stream::RIGHT, Stream::LEFT, img_params.ex_right_to_left);
-    VLOG(2) << "Intrinsics left: {" << GetIntrinsics(Stream::LEFT) << "}";
-    VLOG(2) << "Intrinsics right: {" << GetIntrinsics(Stream::RIGHT) << "}";
-    VLOG(2) << "Extrinsics right to left: {"
-            << GetExtrinsics(Stream::RIGHT, Stream::LEFT) << "}";
->>>>>>> origin/develop:src/mynteye/device/device.cc
   } else {
     LOG(WARNING) << "Intrinsics & extrinsics not exist";
   }

src/mynteye/uvc/linux/uvc-v4l2.cc

@@ -409,16 +409,12 @@ struct device {
     }
 
     if (no_data_count > NO_DATA_MAX_COUNT) {
-<<<<<<< HEAD:src/uvc/uvc-v4l2.cc
       no_data_count = 0;
       living_count = 0;
       LOG(WARNING) << __func__
                    << " failed: v4l2 get stream time out,Try to reboot!";
       stop_capture();
       start_capture();
-=======
-      throw_error("v4l2 get stream time out!");
->>>>>>> origin/develop:src/mynteye/uvc/linux/uvc-v4l2.cc
     }
   }