Fix the conflict again

2018-11-24 16:56:52 +08:00
parent 1811f20a14
commit b346f7fec9
27 changed files with 0 additions and 230 deletions
--- a/samples/device/camera.cc
+++ b/samples/device/camera.cc
@@ -15,17 +15,9 @@
 #include <opencv2/imgproc/imgproc.hpp>

 #include "mynteye/logger.h"
-<<<<<<< HEAD
-
-#include "mynteye/device.h"
-#include "mynteye/utils.h"
-
-#include "mynteye/times.h"
-=======
 #include "mynteye/device/device.h"
 #include "mynteye/device/utils.h"
 #include "mynteye/util/times.h"
->>>>>>> origin/develop

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/auto_exposure.cc
+++ b/samples/tutorials/control/auto_exposure.cc
@@ -13,13 +13,8 @@
 // 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"

--- a/samples/tutorials/control/framerate.cc
+++ b/samples/tutorials/control/framerate.cc
@@ -11,15 +11,6 @@
 // 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>
-
-#include <atomic>
-
-#include "mynteye/api.h"
-#include "mynteye/logger.h"
-#include "mynteye/times.h"
-=======
 #include <atomic>

 #include <opencv2/highgui/highgui.hpp>
@@ -27,7 +18,6 @@
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 #include "mynteye/util/times.h"
->>>>>>> origin/develop

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/infrared.cc
+++ b/samples/tutorials/control/infrared.cc
@@ -13,13 +13,8 @@
 // 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

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/manual_exposure.cc
+++ b/samples/tutorials/control/manual_exposure.cc
@@ -13,13 +13,8 @@
 // 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"

--- a/samples/tutorials/data/get_depth.cc
+++ b/samples/tutorials/data/get_depth.cc
@@ -13,12 +13,7 @@
 // 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

--- a/samples/tutorials/data/get_device_info.cc
+++ b/samples/tutorials/data/get_device_info.cc
@@ -11,13 +11,8 @@
 // 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

--- a/samples/tutorials/data/get_disparity.cc
+++ b/samples/tutorials/data/get_disparity.cc
@@ -13,13 +13,7 @@
 // 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

--- a/samples/tutorials/data/get_from_callbacks.cc
+++ b/samples/tutorials/data/get_from_callbacks.cc
@@ -11,25 +11,15 @@
 // 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"

--- a/samples/tutorials/data/get_img_params.cc
+++ b/samples/tutorials/data/get_img_params.cc
@@ -11,13 +11,8 @@
 // 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

--- a/samples/tutorials/data/get_imu.cc
+++ b/samples/tutorials/data/get_imu.cc
@@ -13,13 +13,8 @@
 // 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"

--- a/samples/tutorials/data/get_imu_params.cc
+++ b/samples/tutorials/data/get_imu_params.cc
@@ -11,13 +11,8 @@
 // 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

--- a/samples/tutorials/data/get_points.cc
+++ b/samples/tutorials/data/get_points.cc
@@ -13,12 +13,7 @@
 // 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"

--- a/samples/tutorials/data/get_stereo.cc
+++ b/samples/tutorials/data/get_stereo.cc
@@ -13,12 +13,7 @@
 // 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

--- a/samples/tutorials/data/get_stereo_rectified.cc
+++ b/samples/tutorials/data/get_stereo_rectified.cc
@@ -13,12 +13,7 @@
 // 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

--- a/samples/tutorials/data/get_with_plugin.cc
+++ b/samples/tutorials/data/get_with_plugin.cc
@@ -13,12 +13,7 @@
 // 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

--- a/samples/tutorials/intermediate/get_all_device_info.cc
+++ b/samples/tutorials/intermediate/get_all_device_info.cc
@@ -11,15 +11,9 @@
 // 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/context.h"
-#include "mynteye/device.h"
-#include "mynteye/logger.h"
-=======
 #include "mynteye/logger.h"
 #include "mynteye/device/context.h"
 #include "mynteye/device/device.h"
->>>>>>> origin/develop

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/intermediate/get_depth_and_points.cc
+++ b/samples/tutorials/intermediate/get_depth_and_points.cc
@@ -14,13 +14,8 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

-<<<<<<< HEAD
-
-#include "mynteye/api.h"
-=======
 // #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
->>>>>>> origin/develop

 #include "util/cv_painter.h"
 #include "util/pc_viewer.h"
--- a/samples/tutorials/util/cv_painter.cc
+++ b/samples/tutorials/util/cv_painter.cc
@@ -13,25 +13,15 @@
 // limitations under the License.
 #include "util/cv_painter.h"

-<<<<<<< HEAD
-#include <opencv2/imgproc/imgproc.hpp>
-
-=======
->>>>>>> origin/develop
 #include <iomanip>
 #include <iostream>
 #include <memory>
 #include <utility>

-<<<<<<< HEAD
-#include "mynteye/logger.h"
-#include "mynteye/utils.h"
-=======
 #include <opencv2/imgproc/imgproc.hpp>

 #include "mynteye/logger.h"
 #include "mynteye/device/utils.h"
->>>>>>> origin/develop

 #define FONT_FACE cv::FONT_HERSHEY_PLAIN
 #define FONT_SCALE 1
--- a/samples/uvc/camera.cc
+++ b/samples/uvc/camera.cc
@@ -17,12 +17,9 @@
 #include <iostream>
 #include <mutex>

-<<<<<<< HEAD
-=======
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

->>>>>>> origin/develop
 #include "mynteye/logger.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"