Fix the conflict

samples/tutorials/data/get_depth.cc

@@ -13,8 +13,12 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_device_info.cc

@@ -11,8 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/logger.h"
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_disparity.cc

@@ -13,9 +13,13 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_from_callbacks.cc

@@ -11,15 +11,25 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+<<<<<<< HEAD
 #include <opencv2/highgui/highgui.hpp>
 
+=======
+>>>>>>> origin/develop
 #include <atomic>
 #include <memory>
 #include <mutex>
 #include <sstream>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include <opencv2/highgui/highgui.hpp>
+
+#include "mynteye/logger.h"
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 #include "util/cv_painter.h"
 
@@ -52,7 +62,7 @@ int main(int argc, char *argv[]) {
   api->SetStreamCallback(
       Stream::DEPTH,
       [&depth_count, &depth, &depth_mtx](const api::StreamData &data) {
-        UNUSED(data)
+        MYNTEYE_UNUSED(data)
         ++depth_count;
         {
           std::lock_guard<std::mutex> _(depth_mtx);

samples/tutorials/data/get_img_params.cc

@@ -11,8 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/logger.h"
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 
@@ -24,8 +29,8 @@ int main(int argc, char *argv[]) {
   LOG(INFO) << "Intrinsics left: {" << api->GetIntrinsics(Stream::LEFT) << "}";
   LOG(INFO) << "Intrinsics right: {" << api->GetIntrinsics(Stream::RIGHT)
             << "}";
-  LOG(INFO) << "Extrinsics left to right: {"
-            << api->GetExtrinsics(Stream::LEFT, Stream::RIGHT) << "}";
+  LOG(INFO) << "Extrinsics right to left: {"
+            << api->GetExtrinsics(Stream::RIGHT, Stream::LEFT) << "}";
 
   return 0;
 }

samples/tutorials/data/get_imu.cc

@@ -13,8 +13,13 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/logger.h"
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 #include "util/cv_painter.h"
 

samples/tutorials/data/get_imu_params.cc

@@ -11,8 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/logger.h"
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_points.cc

@@ -13,8 +13,12 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 #include "util/pc_viewer.h"
 

samples/tutorials/data/get_stereo.cc

@@ -13,8 +13,12 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_stereo_rectified.cc

@@ -13,8 +13,12 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_with_plugin.cc

@@ -13,8 +13,12 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
+<<<<<<< HEAD
 #include "mynteye/api.h"
 #include "mynteye/logger.h"
+=======
+#include "mynteye/api/api.h"
+>>>>>>> origin/develop
 
 MYNTEYE_USE_NAMESPACE