Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the complie error #1052

Merged
merged 1 commit into from
Dec 21, 2014
Merged

Fix the complie error #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix the complie error 
caused by inconsistent template parameters.
  • Loading branch information
@Tonsty
Tonsty committed Dec 21, 2014
commit 78b209af73f3068205c9604b6e4744417516a177
4 changes: 2 additions & 2 deletions ...3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_classifier.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
PointInTPtr in (new pcl::PointCloud<PointInT>);

typename pcl::PointCloud<FeatureT>::CloudVectorType signatures;
std::vector < Eigen::Vector3f > centroids;
std::vector < Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids;

if (indices_.size ())
{
Expand Down Expand Up @@ -187,7 +187,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
PointInTPtr processed (new pcl::PointCloud<PointInT>);
//pro view, compute signatures
typename pcl::PointCloud<FeatureT>::CloudVectorType signatures;
std::vector < Eigen::Vector3f > centroids;
std::vector < Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids;
estimator_->estimate (models->at (i).views_->at (v), processed, signatures, centroids);

//source_->makeModelPersistent (models->at (i), training_dir_, descr_name_, static_cast<int> (v));
Expand Down
4 changes: 2 additions & 2 deletions ...ec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
PointInTPtr in (new pcl::PointCloud<PointInT>);

std::vector<pcl::PointCloud<FeatureT>, Eigen::aligned_allocator<pcl::PointCloud<FeatureT> > > signatures;
std::vector < Eigen::Vector3f > centroids;
std::vector < Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids;

if (indices_.size ())
pcl::copyPointCloud (*input_, indices_, *in);
Expand Down Expand Up @@ -442,7 +442,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>

//pro view, compute signatures and CRH
std::vector<pcl::PointCloud<FeatureT>, Eigen::aligned_allocator<pcl::PointCloud<FeatureT> > > signatures;
std::vector < Eigen::Vector3f > centroids;
std::vector < Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids;
crh_estimator_->estimate (view, processed, signatures, centroids);

std::string path = source_->getModelDescriptorDir (models->at (i), training_dir_, descr_name_);
Expand Down
4 changes: 2 additions & 2 deletions ...c_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_cvfh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
PointInTPtr in (new pcl::PointCloud<PointInT>);

std::vector<pcl::PointCloud<FeatureT>, Eigen::aligned_allocator<pcl::PointCloud<FeatureT> > > signatures;
std::vector < Eigen::Vector3f > centroids;
std::vector < Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids;

if (indices_.size ())
pcl::copyPointCloud (*input_, indices_, *in);
Expand Down Expand Up @@ -669,7 +669,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>

//pro view, compute signatures
std::vector<pcl::PointCloud<FeatureT>, Eigen::aligned_allocator<pcl::PointCloud<FeatureT> > > signatures;
std::vector < Eigen::Vector3f > centroids;
std::vector < Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids;
micvfh_estimator_->estimate (view, processed, signatures, centroids);

std::vector<bool> valid_trans;
Expand Down