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

Eigen with std::vector fixes #1034

Merged
merged 1 commit into from
Dec 14, 2014
Merged

Eigen with std::vector fixes #1034

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
2 changes: 1 addition & 1 deletion ...3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/crh_estimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace pcl
void
estimate (PointInTPtr & in, PointInTPtr & processed,
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 (!feature_estimator_)
Expand Down
2 changes: 1 addition & 1 deletion ...d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/cvfh_estimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace pcl
void
estimate (PointInTPtr & in, PointInTPtr & processed,
typename pcl::PointCloud<FeatureT>::CloudVectorType & signatures,
std::vector<Eigen::Vector3f> & centroids)
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{

if (!normal_estimator_)
Expand Down
2 changes: 1 addition & 1 deletion ...3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/esf_estimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace pcl
void
estimate (PointInTPtr & in, PointInTPtr & processed,
typename pcl::PointCloud<FeatureT>::CloudVectorType & signatures,
std::vector<Eigen::Vector3f> & centroids)
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{

typedef typename pcl::ESFEstimation<PointInT, FeatureT> ESFEstimation;
Expand Down
2 changes: 1 addition & 1 deletion ...rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/global_estimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace pcl
public:
virtual void
estimate (PointInTPtr & in, PointInTPtr & processed, std::vector<pcl::PointCloud<FeatureT>, Eigen::aligned_allocator<
pcl::PointCloud<FeatureT> > > & signatures, std::vector<Eigen::Vector3f> & centroids)=0;
pcl::PointCloud<FeatureT> > > & signatures, std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)=0;

virtual bool computedNormals() = 0;

Expand Down
2 changes: 1 addition & 1 deletion ...ec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/ourcvfh_estimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace pcl

virtual void
estimate (PointInTPtr & in, PointInTPtr & processed, typename pcl::PointCloud<FeatureT>::CloudVectorType & signatures,
std::vector<Eigen::Vector3f> & centroids)
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{

valid_roll_transforms_.clear ();
Expand Down
2 changes: 1 addition & 1 deletion ...3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/vfh_estimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace pcl
void
estimate (PointInTPtr & in, PointInTPtr & processed,
typename pcl::PointCloud<FeatureT>::CloudVectorType & signatures,
std::vector<Eigen::Vector3f> & centroids)
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{

if (!normal_estimator_)
Expand Down
4 changes: 2 additions & 2 deletions apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pc_source/registered_views_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace pcl
}

void
assembleModelFromViewsAndPoses(ModelT & model, std::vector<Eigen::Matrix4f> & poses) {
assembleModelFromViewsAndPoses(ModelT & model, std::vector<Eigen::Matrix4f, Eigen::aligned_allocator<Eigen::Matrix4f> > & poses) {
for(size_t i=0; i < model.views_->size(); i++) {
Eigen::Matrix4f inv = poses[i];
typename pcl::PointCloud<PointInT>::Ptr global_cloud(new pcl::PointCloud<PointInT>);
Expand Down Expand Up @@ -159,7 +159,7 @@ namespace pcl
}
}

std::vector<Eigen::Matrix4f> poses_to_assemble_;
std::vector<Eigen::Matrix4f, Eigen::aligned_allocator<Eigen::Matrix4f> > poses_to_assemble_;

for (size_t i = 0; i < view_filenames.size (); i++)
{
Expand Down
2 changes: 1 addition & 1 deletion apps/src/render_views_tesselated_sphere.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ pcl::apps::RenderViewsTesselatedSphere::generateViews() {
// Get camera positions
vtkPolyData *sphere = subdivide->GetOutput ();

std::vector<Eigen::Vector3f> cam_positions;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > cam_positions;
if (!use_vertices_)
{
vtkSmartPointer<vtkCellArray> cells_sphere = sphere->GetPolys ();
Expand Down
2 changes: 1 addition & 1 deletion common/include/pcl/TextureMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace pcl


std::vector<std::vector<pcl::Vertices> > tex_polygons; // polygon which is mapped with specific texture defined in TexMaterial
std::vector<std::vector<Eigen::Vector2f> > tex_coordinates; // UV coordinates
std::vector<std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > > tex_coordinates; // UV coordinates
std::vector<pcl::TexMaterial> tex_materials; // define texture material

public:
Expand Down
8 changes: 4 additions & 4 deletions common/include/pcl/common/impl/polynomial_calculations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ inline void
template<typename real>
inline pcl::BivariatePolynomialT<real>
pcl::PolynomialCalculationsT<real>::bivariatePolynomialApproximation (
std::vector<Eigen::Matrix<real, 3, 1> >& samplePoints, unsigned int polynomial_degree, bool& error) const
std::vector<Eigen::Matrix<real, 3, 1>, Eigen::aligned_allocator<Eigen::Matrix<real, 3, 1> > >& samplePoints, unsigned int polynomial_degree, bool& error) const
{
pcl::BivariatePolynomialT<real> ret;
error = bivariatePolynomialApproximation (samplePoints, polynomial_degree, ret);
Expand All @@ -384,7 +384,7 @@ inline pcl::BivariatePolynomialT<real>
template<typename real>
inline bool
pcl::PolynomialCalculationsT<real>::bivariatePolynomialApproximation (
std::vector<Eigen::Matrix<real, 3, 1> >& samplePoints, unsigned int polynomial_degree,
std::vector<Eigen::Matrix<real, 3, 1>, Eigen::aligned_allocator<Eigen::Matrix<real, 3, 1> > >& samplePoints, unsigned int polynomial_degree,
pcl::BivariatePolynomialT<real>& ret) const
{
//MEASURE_FUNCTION_TIME;
Expand Down Expand Up @@ -415,7 +415,7 @@ inline bool
real tmpX, tmpY;
real *tmpC = new real[parameters_size];
real* tmpCEndPtr = &tmpC[parameters_size-1];
for (typename std::vector<Eigen::Matrix<real, 3, 1> >::const_iterator it=samplePoints.begin ();
for (typename std::vector<Eigen::Matrix<real, 3, 1>, Eigen::aligned_allocator<Eigen::Matrix<real, 3, 1> > >::const_iterator it=samplePoints.begin ();
it!=samplePoints.end (); ++it)
{
currentX= (*it)[0]; currentY= (*it)[1]; currentZ= (*it)[2];
Expand Down Expand Up @@ -465,7 +465,7 @@ inline bool
//unsigned int posInC;
//real tmpX, tmpY;
//DVector<real> tmpC (parameters_size);
//for (typename std::vector<Eigen::Matrix<real, 3, 1> >::const_iterator it=samplePoints.begin ();
//for (typename std::vector<Eigen::Matrix<real, 3, 1>, Eigen::aligned_allocator<Eigen::Matrix<real, 3, 1> > >::const_iterator it=samplePoints.begin ();
// it!=samplePoints.end (); ++it)
//{
//currentX= (*it)[0]; currentY= (*it)[1]; currentZ= (*it)[2];
Expand Down
4 changes: 2 additions & 2 deletions common/include/pcl/common/polynomial_calculations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ namespace pcl
* error is set to true if the approximation did not work for any reason
* (not enough points, matrix not invertible, etc.) */
inline BivariatePolynomialT<real>
bivariatePolynomialApproximation (std::vector<Eigen::Matrix<real, 3, 1> >& samplePoints,
bivariatePolynomialApproximation (std::vector<Eigen::Matrix<real, 3, 1>, Eigen::aligned_allocator<Eigen::Matrix<real, 3, 1> > >& samplePoints,
unsigned int polynomial_degree, bool& error) const;

//! Same as above, using a reference for the return value
inline bool
bivariatePolynomialApproximation (std::vector<Eigen::Matrix<real, 3, 1> >& samplePoints,
bivariatePolynomialApproximation (std::vector<Eigen::Matrix<real, 3, 1>, Eigen::aligned_allocator<Eigen::Matrix<real, 3, 1> > >& samplePoints,
unsigned int polynomial_degree, BivariatePolynomialT<real>& ret) const;

//! Set the minimum value under which values are considered zero
Expand Down
8 changes: 4 additions & 4 deletions features/include/pcl/features/cvfh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ namespace pcl
* \param[out] centroids vector to hold the centroids
*/
inline void
getCentroidClusters (std::vector<Eigen::Vector3f> & centroids)
getCentroidClusters (std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{
for (size_t i = 0; i < centroids_dominant_orientations_.size (); ++i)
centroids.push_back (centroids_dominant_orientations_[i]);
Expand All @@ -158,7 +158,7 @@ namespace pcl
* \param[out] centroids vector to hold the normal centroids
*/
inline void
getCentroidNormalClusters (std::vector<Eigen::Vector3f> & centroids)
getCentroidNormalClusters (std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{
for (size_t i = 0; i < dominant_normals_.size (); ++i)
centroids.push_back (dominant_normals_[i]);
Expand Down Expand Up @@ -280,9 +280,9 @@ namespace pcl

protected:
/** \brief Centroids that were used to compute different CVFH descriptors */
std::vector<Eigen::Vector3f> centroids_dominant_orientations_;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids_dominant_orientations_;
/** \brief Normal centroids that were used to compute different CVFH descriptors */
std::vector<Eigen::Vector3f> dominant_normals_;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > dominant_normals_;
};
}

Expand Down
2 changes: 1 addition & 1 deletion features/include/pcl/features/impl/rops_estimation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ pcl::ROPSEstimation <PointInT, PointOutT>::computeLRF (const PointInT& point, co
{
const unsigned int number_of_triangles = static_cast <unsigned int> (local_triangles.size ());

std::vector <Eigen::Matrix3f> scatter_matrices (number_of_triangles);
std::vector<Eigen::Matrix3f, Eigen::aligned_allocator<Eigen::Matrix3f> > scatter_matrices (number_of_triangles);
std::vector <float> triangle_area (number_of_triangles);
std::vector <float> distance_weight (number_of_triangles);

Expand Down
8 changes: 4 additions & 4 deletions features/include/pcl/features/our_cvfh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ namespace pcl
* \param[out] centroids vector to hold the centroids
*/
inline void
getCentroidClusters (std::vector<Eigen::Vector3f> & centroids)
getCentroidClusters (std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{
for (size_t i = 0; i < centroids_dominant_orientations_.size (); ++i)
centroids.push_back (centroids_dominant_orientations_[i]);
Expand All @@ -202,7 +202,7 @@ namespace pcl
* \param[out] centroids vector to hold the normal centroids
*/
inline void
getCentroidNormalClusters (std::vector<Eigen::Vector3f> & centroids)
getCentroidNormalClusters (std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > & centroids)
{
for (size_t i = 0; i < dominant_normals_.size (); ++i)
centroids.push_back (dominant_normals_[i]);
Expand Down Expand Up @@ -395,9 +395,9 @@ namespace pcl

protected:
/** \brief Centroids that were used to compute different OUR-CVFH descriptors */
std::vector<Eigen::Vector3f> centroids_dominant_orientations_;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > centroids_dominant_orientations_;
/** \brief Normal centroids that were used to compute different OUR-CVFH descriptors */
std::vector<Eigen::Vector3f> dominant_normals_;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > dominant_normals_;
/** \brief Indices to the points representing the stable clusters */
std::vector<pcl::PointIndices> clusters_;
/** \brief Mapping from clusters to OUR-CVFH descriptors */
Expand Down
2 changes: 1 addition & 1 deletion features/include/pcl/features/principal_curvatures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ namespace pcl

private:
/** \brief A pointer to the input dataset that contains the point normals of the XYZ dataset. */
std::vector<Eigen::Vector3f> projected_normals_;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > projected_normals_;

/** \brief SSE aligned placeholder for the XYZ centroid of a surface patch. */
Eigen::Vector3f xyz_centroid_;
Expand Down
2 changes: 1 addition & 1 deletion filters/include/pcl/filters/covariance_sampling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ namespace pcl
/** \brief The normals computed at each point in the input cloud */
NormalsConstPtr input_normals_;

std::vector<Eigen::Vector3f> scaled_points_;
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > scaled_points_;

bool
initCompute ();
Expand Down
12 changes: 6 additions & 6 deletions filters/include/pcl/filters/fast_bilateral.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace pcl
x_dim_ = width;
y_dim_ = height;
z_dim_ = depth;
v_ = std::vector<Eigen::Vector2f> (width*height*depth, Eigen::Vector2f (0.0f, 0.0f));
v_ = std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > (width*height*depth, Eigen::Vector2f (0.0f, 0.0f));
}

inline Eigen::Vector2f&
Expand Down Expand Up @@ -164,24 +164,24 @@ namespace pcl
z_size () const
{ return z_dim_; }

inline std::vector<Eigen::Vector2f >::iterator
inline std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >::iterator
begin ()
{ return v_.begin (); }

inline std::vector<Eigen::Vector2f >::iterator
inline std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >::iterator
end ()
{ return v_.end (); }

inline std::vector<Eigen::Vector2f >::const_iterator
inline std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >::const_iterator
begin () const
{ return v_.begin (); }

inline std::vector<Eigen::Vector2f >::const_iterator
inline std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >::const_iterator
end () const
{ return v_.end (); }

private:
std::vector<Eigen::Vector2f > v_;
std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > v_;
size_t x_dim_, y_dim_, z_dim_;
};

Expand Down
2 changes: 1 addition & 1 deletion filters/include/pcl/filters/impl/fast_bilateral.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pcl::FastBilateralFilter<PointT>::applyFilter (PointCloud &output)

if (early_division_)
{
for (std::vector<Eigen::Vector2f >::iterator d = data.begin (); d != data.end (); ++d)
for (std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >::iterator d = data.begin (); d != data.end (); ++d)
*d /= ((*d)[0] != 0) ? (*d)[1] : 1;

for (size_t x = 0; x < input_->width; x++)
Expand Down
2 changes: 1 addition & 1 deletion filters/include/pcl/filters/impl/fast_bilateral_omp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ pcl::FastBilateralFilterOMP<PointT>::applyFilter (PointCloud &output)

if (early_division_)
{
for (std::vector<Eigen::Vector2f >::iterator d = data.begin (); d != data.end (); ++d)
for (std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >::iterator d = data.begin (); d != data.end (); ++d)
*d /= ((*d)[0] != 0) ? (*d)[1] : 1;

#ifdef _OPENMP
Expand Down
6 changes: 3 additions & 3 deletions filters/include/pcl/filters/impl/voxel_grid_occlusion_estimation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pcl::VoxelGridOcclusionEstimation<PointT>::occlusionEstimation (int& out_state,
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template <typename PointT> int
pcl::VoxelGridOcclusionEstimation<PointT>::occlusionEstimation (int& out_state,
std::vector<Eigen::Vector3i>& out_ray,
std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >& out_ray,
const Eigen::Vector3i& in_target_voxel)
{
if (!initialized_)
Expand Down Expand Up @@ -130,7 +130,7 @@ pcl::VoxelGridOcclusionEstimation<PointT>::occlusionEstimation (int& out_state,

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template <typename PointT> int
pcl::VoxelGridOcclusionEstimation<PointT>::occlusionEstimationAll (std::vector<Eigen::Vector3i>& occluded_voxels)
pcl::VoxelGridOcclusionEstimation<PointT>::occlusionEstimationAll (std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >& occluded_voxels)
{
if (!initialized_)
{
Expand Down Expand Up @@ -334,7 +334,7 @@ pcl::VoxelGridOcclusionEstimation<PointT>::rayTraversal (const Eigen::Vector3i&

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template <typename PointT> int
pcl::VoxelGridOcclusionEstimation<PointT>::rayTraversal (std::vector <Eigen::Vector3i>& out_ray,
pcl::VoxelGridOcclusionEstimation<PointT>::rayTraversal (std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >& out_ray,
const Eigen::Vector3i& target_voxel,
const Eigen::Vector4f& origin,
const Eigen::Vector4f& direction,
Expand Down
4 changes: 2 additions & 2 deletions filters/include/pcl/filters/voxel_grid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,12 +689,12 @@ namespace pcl
* \note for efficiency, user must make sure that the saving of the leaf layout is enabled and filtering performed
*/
inline std::vector<int>
getNeighborCentroidIndices (float x, float y, float z, const std::vector<Eigen::Vector3i> &relative_coordinates)
getNeighborCentroidIndices (float x, float y, float z, const std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> > &relative_coordinates)
{
Eigen::Vector4i ijk (static_cast<int> (floorf (x * inverse_leaf_size_[0])), static_cast<int> (floorf (y * inverse_leaf_size_[1])), static_cast<int> (floorf (z * inverse_leaf_size_[2])), 0);
std::vector<int> neighbors;
neighbors.reserve (relative_coordinates.size ());
for (std::vector<Eigen::Vector3i>::const_iterator it = relative_coordinates.begin (); it != relative_coordinates.end (); it++)
for (std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >::const_iterator it = relative_coordinates.begin (); it != relative_coordinates.end (); it++)
neighbors.push_back (leaf_layout_[(ijk + (Eigen::Vector4i() << *it, 0).finished() - min_b_).dot (divb_mul_)]);
return (neighbors);
}
Expand Down
6 changes: 3 additions & 3 deletions filters/include/pcl/filters/voxel_grid_occlusion_estimation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ namespace pcl
*/
int
occlusionEstimation (int& out_state,
std::vector<Eigen::Vector3i>& out_ray,
std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >& out_ray,
const Eigen::Vector3i& in_target_voxel);

/** \brief Returns the voxel coordinates (i, j, k) of all occluded
Expand All @@ -118,7 +118,7 @@ namespace pcl
* \return the voxel coordinates (i, j, k)
*/
int
occlusionEstimationAll (std::vector<Eigen::Vector3i>& occluded_voxels);
occlusionEstimationAll (std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >& occluded_voxels);

/** \brief Returns the voxel grid filtered point cloud
* \return The voxel grid filtered point cloud
Expand Down Expand Up @@ -202,7 +202,7 @@ namespace pcl
* \return The estimated voxel state.
*/
int
rayTraversal (std::vector <Eigen::Vector3i>& out_ray,
rayTraversal (std::vector<Eigen::Vector3i, Eigen::aligned_allocator<Eigen::Vector3i> >& out_ray,
const Eigen::Vector3i& target_voxel,
const Eigen::Vector4f& origin,
const Eigen::Vector4f& direction,
Expand Down
2 changes: 1 addition & 1 deletion geometry/include/pcl/geometry/impl/polygon_operations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ pcl::approximatePolygon2D (const typename pcl::PointCloud<PointT>::VectorType &p
approx_polygon.reserve (result.size ());
if (refine)
{
std::vector<Eigen::Vector3f> lines (result.size ());
std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > lines (result.size ());
std::reverse (result.begin (), result.end ());
for (unsigned rIdx = 0; rIdx < result.size (); ++rIdx)
{
Expand Down
2 changes: 1 addition & 1 deletion gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/impl/standalone_marching_cubes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pcl::gpu::kinfuLS::StandaloneMarchingCubes<PointT>::getMeshFromTSDFCloud (const

//template <typename PointT> std::vector< typename pcl::gpu::StandaloneMarchingCubes<PointT>::MeshPtr >
template <typename PointT> void
pcl::gpu::kinfuLS::StandaloneMarchingCubes<PointT>::getMeshesFromTSDFVector (const std::vector<PointCloudPtr> &tsdf_clouds, const std::vector<Eigen::Vector3f> &tsdf_offsets)
pcl::gpu::kinfuLS::StandaloneMarchingCubes<PointT>::getMeshesFromTSDFVector (const std::vector<PointCloudPtr> &tsdf_clouds, const std::vector<Eigen::Vector3f, Eigen::aligned_allocator<Eigen::Vector3f> > &tsdf_offsets)
{
std::vector< MeshPtr > meshes_vector;

Expand Down
Loading