Skip to content

Commit 727fbe2

Browse files
authored
Merge pull request #6017 from mvieth/revert_abi_problems_1_14_1
Fix ABI compatibility problems for 1.14.1 release
2 parents 691d8b7 + 6be79ec commit 727fbe2

3 files changed

Lines changed: 4 additions & 10 deletions

File tree

io/src/obj_io.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,8 @@ pcl::OBJReader::read (const std::string &file_name, pcl::TextureMesh &mesh,
711711
// Tokenize the line
712712
pcl::split (st, line, "\t\r ");
713713

714-
// Ignore comments and lines with only whitespace
715-
if (st.empty() || st[0] == "#")
714+
// Ignore comments
715+
if (st[0] == "#")
716716
continue;
717717
// Vertex
718718
if (st[0] == "v")

io/src/pcd_io.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -677,13 +677,7 @@ pcl::PCDReader::read (const std::string &file_name, pcl::PCLPointCloud2 &cloud,
677677
pcl::console::TicToc tt;
678678
tt.tic ();
679679

680-
if (file_name.empty ())
681-
{
682-
PCL_ERROR ("[pcl::PCDReader::read] No file name given!\n");
683-
return (-1);
684-
}
685-
686-
if (!pcl_fs::exists (file_name))
680+
if (file_name.empty () || !pcl_fs::exists (file_name))
687681
{
688682
PCL_ERROR ("[pcl::PCDReader::read] Could not find file '%s'.\n", file_name.c_str ());
689683
return (-1);

registration/include/pcl/registration/impl/transformation_estimation_svd.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ TransformationEstimationSVD<PointSource, PointTarget, Scalar>::
211211
Eigen::Matrix<Scalar, 3, 3> R = v * u.transpose();
212212

213213
// Return the correct transformation
214-
transformation_matrix.template topLeftCorner<3, 3>() = R;
214+
transformation_matrix.topLeftCorner(3, 3) = R;
215215
const Eigen::Matrix<Scalar, 3, 1> Rc(R * centroid_src.template head<3>());
216216
transformation_matrix.template block<3, 1>(0, 3) =
217217
centroid_tgt.template head<3>() - Rc;

0 commit comments

Comments
 (0)