apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing dependency on roscpp

Browse Source
This commit is contained in:
William Woodall 2013-07-12 14:10:06 -07:00
parent 2f1a58d442
commit 7a46755d94
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.3)
project(pcl_conversions)
find_package(catkin REQUIRED COMPONENTS sensor_msgs std_msgs)
find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs std_msgs)
find_package(PCL REQUIRED QUIET COMPONENTS common)

29
include/pcl_conversions/pcl_conversions.h
View File

@ -512,9 +512,9 @@ namespace pcl {
/** Overload pcl::io::savePCDFile **/
inline int
inline int
savePCDFile(const std::string &file_name, const sensor_msgs::PointCloud2 &cloud,
const Eigen::Vector4f &origin = Eigen::Vector4f::Zero (),
const Eigen::Vector4f &origin = Eigen::Vector4f::Zero (),
const Eigen::Quaternionf &orientation = Eigen::Quaternionf::Identity (),
const bool binary_mode = false)
{
@ -523,9 +523,9 @@ namespace pcl {
return pcl::io::savePCDFile(file_name, pcl_cloud, origin, orientation, binary_mode);
}
inline int
inline int
destructiveSavePCDFile(const std::string &file_name, sensor_msgs::PointCloud2 &cloud,
const Eigen::Vector4f &origin = Eigen::Vector4f::Zero (),
const Eigen::Vector4f &origin = Eigen::Vector4f::Zero (),
const Eigen::Quaternionf &orientation = Eigen::Quaternionf::Identity (),
const bool binary_mode = false)
{
@ -579,7 +579,7 @@ namespace pcl {
PCL_ERROR ("[pcl::concatenatePointCloud] Number of fields in cloud1 (%u) != Number of fields in cloud2 (%u)\n", cloud1.fields.size (), cloud2.fields.size ());
return (false);
}
// Copy cloud1 into cloud_out
cloud_out = cloud1;
size_t nrpts = cloud_out.data.size ();
@ -602,7 +602,7 @@ namespace pcl {
if (cloud2.fields[j].name == "_")
continue;
fields2_sizes.push_back (cloud2.fields[j].count *
fields2_sizes.push_back (cloud2.fields[j].count *
pcl::getFieldSize (cloud2.fields[j].datatype));
fields2.push_back (cloud2.fields[j]);
}
@ -626,8 +626,8 @@ namespace pcl {
(cloud1.fields[i].name == "rgba" && fields2[j].name == "rgb") ||
(cloud1.fields[i].name == fields2[j].name))
{
memcpy (reinterpret_cast<char*> (&cloud_out.data[nrpts + cp * cloud1.point_step + cloud1.fields[i].offset]),
reinterpret_cast<const char*> (&cloud2.data[cp * cloud2.point_step + cloud2.fields[j].offset]),
memcpy (reinterpret_cast<char*> (&cloud_out.data[nrpts + cp * cloud1.point_step + cloud1.fields[i].offset]),
reinterpret_cast<const char*> (&cloud2.data[cp * cloud2.point_step + cloud2.fields[j].offset]),
fields2_sizes[j]);
++i; // increment the field size i
}
@ -645,11 +645,10 @@ namespace pcl {
// Otherwise we need to make sure the names are the same
if (cloud1.fields[i].name != cloud2.fields[i].name)
{
PCL_ERROR ("[pcl::concatenatePointCloud] Name of field %d in cloud1, %s, does not match name in cloud2, %s\n", i, cloud1.fields[i].name.c_str (), cloud2.fields[i].name.c_str ());
PCL_ERROR ("[pcl::concatenatePointCloud] Name of field %d in cloud1, %s, does not match name in cloud2, %s\n", i, cloud1.fields[i].name.c_str (), cloud2.fields[i].name.c_str ());
return (false);
}
}
cloud_out.data.resize (nrpts + cloud2.data.size ());
memcpy (&cloud_out.data[nrpts], &cloud2.data[0], cloud2.data.size ());
}
@ -658,11 +657,11 @@ namespace pcl {
} // namespace pcl
namespace ros
namespace ros
{
template<>
struct DefaultMessageCreator<pcl::PCLPointCloud2>
{
{
boost::shared_ptr<pcl::PCLPointCloud2> operator() ()
{
boost::shared_ptr<pcl::PCLPointCloud2> msg(new pcl::PCLPointCloud2());
@ -670,7 +669,7 @@ namespace ros
}
};
namespace message_traits
namespace message_traits
{
template<>
struct MD5Sum<pcl::PCLPointCloud2>
@ -680,7 +679,7 @@ namespace ros
static const uint64_t static_value1 = MD5Sum<sensor_msgs::PointCloud2>::static_value1;
static const uint64_t static_value2 = MD5Sum<sensor_msgs::PointCloud2>::static_value2;
// If the definition of sensor_msgs/PointCloud2 changes, we'll get a compile error here.
ROS_STATIC_ASSERT(static_value1 == 0x1158d486dd51d683ULL);
ROS_STATIC_ASSERT(static_value2 == 0xce2f1be655c3c181ULL);
@ -703,7 +702,7 @@ namespace ros
template<> struct HasHeader<pcl::PCLPointCloud2> : TrueType {};
} // namespace ros::message_traits
namespace serialization
namespace serialization
{
/*
* Provide a custom serialization for pcl::PCLPointCloud2

6
package.xml
View File

@ -14,12 +14,14 @@
<buildtool_depend>catkin</buildtool_depend>
<build_depend>pcl</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>pcl</build_depend>
<run_depend>pcl</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>std_msgs</run_depend>
<run_depend>pcl</run_depend>
</package>