Merge branch 'develop' into feature/android

* develop:
  fix(cmake): fix inlcude ceres miniglog
  feat(bm model): add bm model
  fix(ros): fix record -a bug
  fix(dataset): fix record bug
  fix(rectify): delete useless log
  fix(calib models): calib struct update
  fix(calib models): use shared ptr value change instead of ptr change
  fix(cmake): fix include ceres and move definitions to mynteye.h
  fix(calib models): default work improve
  fix(calib model): default config now work
  fix(cam models): sample enable bug and remove unused include
  fix(device.cc:456): fixed compile error on windows

wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt

@@ -83,13 +83,10 @@ if(NOT mynteye_WITH_API)
   message(FATAL_ERROR "Must with API layer :(")
 endif()
 
-include(cmake/DetectOpenCV.cmake)
+find_package(OpenCV REQUIRED)
 
 if(mynteye_WITH_GLOG)
   find_package(glog REQUIRED)
-  if(glog_FOUND)
-    add_definitions(-DWITH_GLOG)
-  endif()
 endif()
 
 # targets

wrappers/ros/src/mynt_eye_ros_wrapper/cmake/DetectOpenCV.cmake

@@ -1,42 +0,0 @@
-# Copyright 2018 Slightech Co., Ltd. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-include(${CMAKE_CURRENT_LIST_DIR}/IncludeGuard.cmake)
-cmake_include_guard()
-
-find_package(OpenCV REQUIRED)
-
-message(STATUS "Found OpenCV: ${OpenCV_VERSION}")
-
-set(WITH_OPENCV TRUE)
-add_definitions(-DWITH_OPENCV)
-
-if(OpenCV_VERSION VERSION_LESS 3.0)
-  add_definitions(-DWITH_OPENCV2)
-elseif(OpenCV_VERSION VERSION_LESS 4.0)
-  add_definitions(-DWITH_OPENCV3)
-else()
-  add_definitions(-DWITH_OPENCV4)
-endif()
-
-list(FIND OpenCV_LIBS "opencv_world" __index)
-if(${__index} GREATER -1)
-  set(WITH_OPENCV_WORLD TRUE)
-endif()
-
-if(MSVC OR MSYS OR MINGW)
-  get_filename_component(OpenCV_LIB_SEARCH_PATH "${OpenCV_LIB_PATH}/../bin" ABSOLUTE)
-else()
-  set(OpenCV_LIB_SEARCH_PATH "${OpenCV_LIB_PATH}")
-endif()

wrappers/ros/src/mynt_eye_ros_wrapper/cmake/IncludeGuard.cmake

@@ -1,23 +0,0 @@
-# Copyright 2018 Slightech Co., Ltd. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-# include_guard: https://cmake.org/cmake/help/latest/command/include_guard.html
-
-macro(cmake_include_guard)
-  get_property(INCLUDE_GUARD GLOBAL PROPERTY "_INCLUDE_GUARD_${CMAKE_CURRENT_LIST_FILE}")
-  if(INCLUDE_GUARD)
-    return()
-  endif()
-  set_property(GLOBAL PROPERTY "_INCLUDE_GUARD_${CMAKE_CURRENT_LIST_FILE}" TRUE)
-endmacro()

wrappers/ros/src/mynt_eye_ros_wrapper/launch/mynteye.launch

@@ -310,7 +310,7 @@
         - 'image_transport/compressedDepth'
       </rosparam>
     </group>
-    <group ns="$(arg right_rect_topic)">
+    <group ns="$(arg left_mono_topic)">
       <rosparam param="disable_pub_plugins">
         - 'image_transport/compressedDepth'
       </rosparam>
@@ -320,6 +320,16 @@
         - 'image_transport/compressedDepth'
       </rosparam>
     </group>
+    <group ns="$(arg right_mono_topic)">
+      <rosparam param="disable_pub_plugins">
+        - 'image_transport/compressedDepth'
+      </rosparam>
+    </group>
+    <group ns="$(arg right_rect_topic)">
+      <rosparam param="disable_pub_plugins">
+        - 'image_transport/compressedDepth'
+      </rosparam>
+    </group>
     <group ns="$(arg disparity_topic)">
       <rosparam param="disable_pub_plugins">
         - 'image_transport/compressedDepth'