12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add proto3 installation to jenkins Dockerfile. (#590) 

[RFC=0000](https://github.com/googlecartographer/rfcs/blob/master/text/0000-proto3-transition.md)
master
Christoph Schütte 2017-11-13 18:52:10 +01:00 committed by Wally B. Feed
parent 5210e92533
commit 3e684b298b
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cartographer_ros/cartographer_ros/node_main.cc
View File

@ -31,7 +31,8 @@ DEFINE_string(map_filename, "", "If non-empty, filename of a map to load.");
DEFINE_bool( DEFINE_bool(
start_trajectory_with_default_topics, true, start_trajectory_with_default_topics, true,
"Enable to immediately start the first trajectory with default topics."); "Enable to immediately start the first trajectory with default topics.");
DEFINE_string(save_map_filename, "", DEFINE_string(
save_map_filename, "",
"If non-empty, serialize state and write it to disk before shutting down."); "If non-empty, serialize state and write it to disk before shutting down.");
namespace cartographer_ros { namespace cartographer_ros {

3
cartographer_ros/cartographer_ros/occupancy_grid_node_main.cc
View File

@ -194,7 +194,8 @@ void Node::PublishOccupancyGrid(const std::string& frame_id,
occupancy_grid.info.origin.orientation.y = 0.; occupancy_grid.info.origin.orientation.y = 0.;
occupancy_grid.info.origin.orientation.z = 0.; occupancy_grid.info.origin.orientation.z = 0.;
const uint32_t* pixel_data = reinterpret_cast<uint32_t*>(cairo_image_surface_get_data(surface)); const uint32_t* pixel_data =
reinterpret_cast<uint32_t*>(cairo_image_surface_get_data(surface));
occupancy_grid.data.reserve(width * height); occupancy_grid.data.reserve(width * height);
for (int y = height - 1; y >= 0; --y) { for (int y = height - 1; y >= 0; --y) {
for (int x = 0; x < width; ++x) { for (int x = 0; x < width; ++x) {

3
jenkins/Dockerfile.kinetic
View File

@ -37,6 +37,9 @@ COPY cartographer_rviz/package.xml catkin_ws/src/cartographer_ros/cartographer_r
COPY scripts/install_debs.sh cartographer_ros/scripts/ COPY scripts/install_debs.sh cartographer_ros/scripts/
RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/* RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
# Install proto3.
RUN /catkin_ws/src/cartographer/scripts/install_proto3.sh
# Build, install, and test all packages individually to allow caching. The # Build, install, and test all packages individually to allow caching. The
# ordering of these steps must match the topological package ordering as # ordering of these steps must match the topological package ordering as
# determined by Catkin. # determined by Catkin.