Skip to content

Commit 2533106

Browse files
committed
Merge branch 'master' into release
2 parents f98372b + 8d3a14e commit 2533106

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

registration/include/pcl/registration/elch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ namespace pcl
7373
{
7474
Vertex () : cloud () {}
7575
PointCloudPtr cloud;
76+
Eigen::Affine3f transform;
7677
};
7778

7879
/** \brief graph structure to hold the SLAM graph */

registration/include/pcl/registration/impl/elch.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ pcl::registration::ELCH<PointT>::compute ()
266266
//a = aend * a * aendI;
267267

268268
pcl::transformPointCloud (*(*loop_graph_)[i].cloud, *(*loop_graph_)[i].cloud, a);
269+
(*loop_graph_)[i].transform = a;
269270
}
270271

271272
add_edge (loop_start_, loop_end_, *loop_graph_);

visualization/include/pcl/visualization/pcl_visualizer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ namespace pcl
282282
"addCoordinateSystem (scale, viewport) is deprecated, please use function "
283283
"addCoordinateSystem (scale, id, viewport) with id a unique string identifier.")
284284
void
285-
addCoordinateSystem (double scale, int viewport = 0);
285+
addCoordinateSystem (double scale, int viewport);
286286

287287
/** \brief Adds 3D axes describing a coordinate system to screen at 0,0,0.
288288
* \param[in] scale the scale of the axes (default: 1)
@@ -303,7 +303,7 @@ namespace pcl
303303
"addCoordinateSystem (scale, x, y, z, viewport) is deprecated, please use function "
304304
"addCoordinateSystem (scale, x, y, z, id, viewport) with id a unique string identifier.")
305305
void
306-
addCoordinateSystem (double scale, float x, float y, float z, int viewport = 0);
306+
addCoordinateSystem (double scale, float x, float y, float z, int viewport);
307307

308308
/** \brief Adds 3D axes describing a coordinate system to screen at x, y, z
309309
* \param[in] scale the scale of the axes (default: 1)
@@ -326,7 +326,7 @@ namespace pcl
326326
"addCoordinateSystem (scale, t, viewport) is deprecated, please use function "
327327
"addCoordinateSystem (scale, t, id, viewport) with id a unique string identifier.")
328328
void
329-
addCoordinateSystem (double scale, const Eigen::Affine3f& t, int viewport = 0);
329+
addCoordinateSystem (double scale, const Eigen::Affine3f& t, int viewport);
330330

331331
/** \brief Adds 3D axes describing a coordinate system to screen at x, y, z, Roll,Pitch,Yaw
332332
*
@@ -373,7 +373,7 @@ namespace pcl
373373
"removeCoordinateSystem (viewport) is deprecated, please use function "
374374
"addCoordinateSystem (id, viewport) with id a unique string identifier.")
375375
bool
376-
removeCoordinateSystem (int viewport = 0);
376+
removeCoordinateSystem (int viewport);
377377

378378
/** \brief Removes a previously added 3D axes (coordinate system)
379379
* \param[in] id the coordinate system object id (default: reference)

0 commit comments

Comments
 (0)