Fix the conflict

samples/api/camera.cc

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

samples/api/get_depth_with_region.cc

@@ -14,10 +14,7 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include "mynteye/api.h"
-
-#define WIN_FLAGS \
-  cv::WINDOW_AUTOSIZE | cv::WINDOW_KEEPRATIO | cv::WINDOW_GUI_NORMAL
+#include "mynteye/api/api.h"
 
 namespace {
 
@@ -32,7 +29,7 @@ class DepthRegion {
    * 鼠标事件：默认不选中区域，随鼠标移动而显示。单击后，则会选中区域来显示。你可以再单击已选中区域或双击未选中区域，取消选中。
    */
   void OnMouse(const int &event, const int &x, const int &y, const int &flags) {
-    UNUSED(flags)
+    MYNTEYE_UNUSED(flags)
     if (event != CV_EVENT_MOUSEMOVE && event != CV_EVENT_LBUTTONDOWN) {
       return;
     }
@@ -157,14 +154,14 @@ int main(int argc, char *argv[]) {
 
   api->Start(Source::VIDEO_STREAMING);
 
-  cv::namedWindow("frame", WIN_FLAGS);
-  cv::namedWindow("depth", WIN_FLAGS);
-  cv::namedWindow("region", WIN_FLAGS);
+  cv::namedWindow("frame");
+  cv::namedWindow("depth");
+  cv::namedWindow("region");
 
   DepthRegion depth_region(3);
   auto depth_info = [](
       const cv::Mat &depth, const cv::Point &point, const std::uint32_t &n) {
-    UNUSED(depth)
+    MYNTEYE_UNUSED(depth)
     std::ostringstream os;
     os << "depth pos: [" << point.y << ", " << point.x << "]"
        << "±" << n << ", unit: mm";
@@ -187,7 +184,7 @@ int main(int argc, char *argv[]) {
       // Show disparity instead of depth, but show depth values in region.
       auto &&depth_frame = disp_data.frame;
 
-#ifdef USE_OPENCV3
+#ifdef WITH_OPENCV3
       // ColormapTypes
       //   http://docs.opencv.org/master/d3/d50/group__imgproc__colormap.html#ga9a805d8262bcbe273f16be9ea2055a65
       cv::applyColorMap(depth_frame, depth_frame, cv::COLORMAP_JET);