remove cv_bridge; close camera calibration funtion

fengepsilon · May 23, 2017 · 4ae819f · 4ae819f
1 parent 812547a
commit 4ae819f
Show file tree

Hide file tree

Showing 59 changed files with 23 additions and 5,830 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,11 @@ Ubuntu 14.04 16.04.
 ROS Indigo, Kinetic. [ROS Installation](http://wiki.ros.org/indigo/Installation/Ubuntu)
 additional ROS pacakge
 ```
-    sudo apt-get install  ros-YOUR_DISTRO-tf ros-YOUR_DISTRO-message-filters ros-YOUR_DISTRO-image-transport
+    sudo apt-get install ros-YOUR_DISTRO-cv-bridge ros-YOUR_DISTRO-tf ros-YOUR_DISTRO-message-filters ros-YOUR_DISTRO-image-transport
+```
+For ROS Kinetic
+```
+    sudo apt-get install ros-kinetic-opencv3
 ```
 
 1.2. **Ceres Solver**

diff --git a/ar_demo/CMakeLists.txt b/ar_demo/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(catkin REQUIRED COMPONENTS
   std_msgs
   image_transport
   sensor_msgs
-  cv_bridge_1_11
+  cv_bridge
   message_filters
   camera_model
 )

diff --git a/ar_demo/package.xml b/ar_demo/package.xml
@@ -44,12 +44,10 @@
   <build_depend>rospy</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>camera_model</build_depend>
-  <build_depend>cv_bridge_1_11</build_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>rospy</run_depend>
   <run_depend>std_msgs</run_depend>
   <run_depend>camera_model</run_depend>
-  <run_depend>cv_bridge_1_11</run_depend>
 
 
   <!-- The export tag contains other, unspecified, tags -->

diff --git a/camera_model/CMakeLists.txt b/camera_model/CMakeLists.txt
@@ -34,20 +34,20 @@ include_directories(
 include_directories("include")
 
 
-add_executable(Calibration 
-    src/intrinsic_calib.cc
-    src/chessboard/Chessboard.cc
-    src/calib/CameraCalibration.cc
-    src/camera_models/Camera.cc
-    src/camera_models/CameraFactory.cc
-    src/camera_models/CostFunctionFactory.cc
-    src/camera_models/PinholeCamera.cc
-    src/camera_models/CataCamera.cc
-    src/camera_models/EquidistantCamera.cc
-    src/camera_models/ScaramuzzaCamera.cc
-    src/sparse_graph/Transform.cc
-    src/gpl/gpl.cc
-    src/gpl/EigenQuaternionParameterization.cc)
+# add_executable(Calibration 
+#     src/intrinsic_calib.cc
+#     src/chessboard/Chessboard.cc
+#     src/calib/CameraCalibration.cc
+#     src/camera_models/Camera.cc
+#     src/camera_models/CameraFactory.cc
+#     src/camera_models/CostFunctionFactory.cc
+#     src/camera_models/PinholeCamera.cc
+#     src/camera_models/CataCamera.cc
+#     src/camera_models/EquidistantCamera.cc
+#     src/camera_models/ScaramuzzaCamera.cc
+#     src/sparse_graph/Transform.cc
+#     src/gpl/gpl.cc
+#     src/gpl/EigenQuaternionParameterization.cc)
 
 add_library(camera_model STATIC
     src/chessboard/Chessboard.cc
@@ -63,5 +63,5 @@ add_library(camera_model STATIC
     src/gpl/gpl.cc
     src/gpl/EigenQuaternionParameterization.cc)
 
-target_link_libraries(Calibration ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
+# target_link_libraries(Calibration ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})
 target_link_libraries(camera_model ${Boost_LIBRARIES} ${OpenCV_LIBS} ${CERES_LIBRARIES})