tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the conflict again

Browse Source
This commit is contained in:
kalman
2018-11-24 16:56:52 +08:00
parent 1811f20a14
commit b346f7fec9
27 changed files with 0 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/tutorials/control/auto_exposure.cc
View File

@@ -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"

10
samples/tutorials/control/framerate.cc
View File

@@ -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

5
samples/tutorials/control/infrared.cc
View File

@@ -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

5
samples/tutorials/control/manual_exposure.cc
View File

@@ -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"