[sdformat] 01/01: Include boost header in patch
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Tue Aug 30 23:18:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository sdformat.
commit b77c74d3d0398386c1a4e01abed90bb0734097c4
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Tue Aug 30 23:18:46 2016 +0000
Include boost header in patch
---
debian/patches/0003-urdfdom-replace-boost.patch | 60 ++++++++++++++-----------
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/debian/patches/0003-urdfdom-replace-boost.patch b/debian/patches/0003-urdfdom-replace-boost.patch
index a6f0b55..7a333fd 100644
--- a/debian/patches/0003-urdfdom-replace-boost.patch
+++ b/debian/patches/0003-urdfdom-replace-boost.patch
@@ -3,10 +3,18 @@ Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Forwarded: No
diff --git a/src/parser_urdf.cc b/src/parser_urdf.cc
-index fe9bb9b..a343b22 100644
+index fe9bb9b..6ff603f 100644
--- a/src/parser_urdf.cc
+++ b/src/parser_urdf.cc
-@@ -32,10 +34,10 @@
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <set>
+ #include <ignition/math.hh>
++#include <boost/algorithm/string.hpp>
+
+ #include "urdf_model/model.h"
+ #include "urdf_model/link.h"
+@@ -32,10 +33,10 @@
using namespace sdf;
@@ -21,7 +29,7 @@ index fe9bb9b..a343b22 100644
typedef std::shared_ptr<TiXmlElement> TiXmlElementPtr;
typedef std::shared_ptr<SDFExtension> SDFExtensionPtr;
typedef std::map<std::string, std::vector<SDFExtensionPtr> >
-@@ -78,7 +80,7 @@ void InsertSDFExtensionJoint(TiXmlElement *_elem,
+@@ -78,7 +79,7 @@ void InsertSDFExtensionJoint(TiXmlElement *_elem,
/// reduced fixed joints: check if a fixed joint should be lumped
/// checking both the joint type and if disabledFixedJointLumping
/// option is set
@@ -30,7 +38,7 @@ index fe9bb9b..a343b22 100644
/// reduced fixed joints: apply transform reduction for ray sensors
/// in extensions when doing fixed joint reduction
-@@ -217,9 +219,9 @@ std::string Values2str(unsigned int _count, const double *_values);
+@@ -217,9 +218,9 @@ std::string Values2str(unsigned int _count, const double *_values);
void CreateGeometry(TiXmlElement* _elem,
@@ -42,7 +50,7 @@ index fe9bb9b..a343b22 100644
double *_sizeVals);
ignition::math::Pose3d inverseTransformToParentFrame(
-@@ -326,10 +328,10 @@ std::string Vector32Str(const urdf::Vector3 _vector)
+@@ -326,10 +327,10 @@ std::string Vector32Str(const urdf::Vector3 _vector)
// In urdfdom_headers 0.2.x, there are group names for
// visuals and collisions in Link class:
// std::map<std::string,
@@ -55,7 +63,7 @@ index fe9bb9b..a343b22 100644
// > collision_groups;
// and we have Visual::group_name and
// Collision::group_name
-@@ -345,7 +347,7 @@ void ReduceCollisionToParent(UrdfLinkPtr _parentLink,
+@@ -345,7 +346,7 @@ void ReduceCollisionToParent(UrdfLinkPtr _parentLink,
UrdfCollisionPtr _collision)
{
#ifndef URDF_GE_0P3
@@ -64,7 +72,7 @@ index fe9bb9b..a343b22 100644
cols = _parentLink->getCollisions(_name);
if (!cols)
-@@ -404,10 +406,10 @@ void ReduceCollisionToParent(UrdfLinkPtr _parentLink,
+@@ -404,10 +405,10 @@ void ReduceCollisionToParent(UrdfLinkPtr _parentLink,
// In urdfdom_headers 0.2.x, there are group names for
// visuals and collisions in Link class:
// std::map<std::string,
@@ -77,7 +85,7 @@ index fe9bb9b..a343b22 100644
// > collision_groups;
// and we have Visual::group_name and
// Collision::group_name
-@@ -423,7 +425,7 @@ void ReduceVisualToParent(UrdfLinkPtr _parentLink,
+@@ -423,7 +424,7 @@ void ReduceVisualToParent(UrdfLinkPtr _parentLink,
UrdfVisualPtr _visual)
{
#ifndef URDF_GE_0P3
@@ -86,7 +94,7 @@ index fe9bb9b..a343b22 100644
viss = _parentLink->getVisuals(_name);
if (!viss)
-@@ -946,7 +948,7 @@ void ReduceVisualsToParent(UrdfLinkPtr _link)
+@@ -946,7 +947,7 @@ void ReduceVisualsToParent(UrdfLinkPtr _link)
// (original parent link name before lumping/reducing).
#ifndef URDF_GE_0P3
for (std::map<std::string,
@@ -95,7 +103,7 @@ index fe9bb9b..a343b22 100644
visualsIt = _link->visual_groups.begin();
visualsIt != _link->visual_groups.end(); ++visualsIt)
{
-@@ -1053,7 +1055,7 @@ void ReduceCollisionsToParent(UrdfLinkPtr _link)
+@@ -1053,7 +1054,7 @@ void ReduceCollisionsToParent(UrdfLinkPtr _link)
// (original parent link name before lumping/reducing).
#ifndef URDF_GE_0P3
for (std::map<std::string,
@@ -104,7 +112,7 @@ index fe9bb9b..a343b22 100644
collisionsIt = _link->collision_groups.begin();
collisionsIt != _link->collision_groups.end(); ++collisionsIt)
{
-@@ -1156,7 +1158,7 @@ void ReduceJointsToParent(UrdfLinkPtr _link)
+@@ -1156,7 +1157,7 @@ void ReduceJointsToParent(UrdfLinkPtr _link)
// a parent link up stream that does not have a fixed parentJoint
for (unsigned int i = 0 ; i < _link->child_links.size() ; ++i)
{
@@ -113,7 +121,7 @@ index fe9bb9b..a343b22 100644
_link->child_links[i]->parent_joint;
if (!FixedJointShouldBeReduced(parentJoint))
{
-@@ -2335,7 +2337,7 @@ void InsertSDFExtensionRobot(TiXmlElement *_elem)
+@@ -2335,7 +2336,7 @@ void InsertSDFExtensionRobot(TiXmlElement *_elem)
////////////////////////////////////////////////////////////////////////////////
void CreateGeometry(TiXmlElement* _elem,
@@ -122,7 +130,7 @@ index fe9bb9b..a343b22 100644
{
TiXmlElement *sdfGeometry = new TiXmlElement("geometry");
-@@ -2347,8 +2349,8 @@ void CreateGeometry(TiXmlElement* _elem,
+@@ -2347,8 +2348,8 @@ void CreateGeometry(TiXmlElement* _elem,
case urdf::Geometry::BOX:
type = "box";
{
@@ -133,7 +141,7 @@ index fe9bb9b..a343b22 100644
int sizeCount = 3;
double sizeVals[3];
sizeVals[0] = box->dim.x;
-@@ -2362,8 +2364,8 @@ void CreateGeometry(TiXmlElement* _elem,
+@@ -2362,8 +2363,8 @@ void CreateGeometry(TiXmlElement* _elem,
case urdf::Geometry::CYLINDER:
type = "cylinder";
{
@@ -144,7 +152,7 @@ index fe9bb9b..a343b22 100644
geometryType = new TiXmlElement(type);
AddKeyValue(geometryType, "length",
Values2str(1, &cylinder->length));
-@@ -2374,8 +2376,8 @@ void CreateGeometry(TiXmlElement* _elem,
+@@ -2374,8 +2375,8 @@ void CreateGeometry(TiXmlElement* _elem,
case urdf::Geometry::SPHERE:
type = "sphere";
{
@@ -155,7 +163,7 @@ index fe9bb9b..a343b22 100644
geometryType = new TiXmlElement(type);
AddKeyValue(geometryType, "radius",
Values2str(1, &sphere->radius));
-@@ -2384,8 +2386,8 @@ void CreateGeometry(TiXmlElement* _elem,
+@@ -2384,8 +2385,8 @@ void CreateGeometry(TiXmlElement* _elem,
case urdf::Geometry::MESH:
type = "mesh";
{
@@ -166,7 +174,7 @@ index fe9bb9b..a343b22 100644
geometryType = new TiXmlElement(type);
AddKeyValue(geometryType, "scale", Vector32Str(mesh->scale));
// do something more to meshes
-@@ -2447,7 +2449,7 @@ void CreateGeometry(TiXmlElement* _elem,
+@@ -2447,7 +2448,7 @@ void CreateGeometry(TiXmlElement* _elem,
////////////////////////////////////////////////////////////////////////////////
std::string GetGeometryBoundingBox(
@@ -175,7 +183,7 @@ index fe9bb9b..a343b22 100644
{
std::string type;
-@@ -2456,8 +2458,8 @@ std::string GetGeometryBoundingBox(
+@@ -2456,8 +2457,8 @@ std::string GetGeometryBoundingBox(
case urdf::Geometry::BOX:
type = "box";
{
@@ -186,7 +194,7 @@ index fe9bb9b..a343b22 100644
_sizeVals[0] = box->dim.x;
_sizeVals[1] = box->dim.y;
_sizeVals[2] = box->dim.z;
-@@ -2466,8 +2468,8 @@ std::string GetGeometryBoundingBox(
+@@ -2466,8 +2467,8 @@ std::string GetGeometryBoundingBox(
case urdf::Geometry::CYLINDER:
type = "cylinder";
{
@@ -197,7 +205,7 @@ index fe9bb9b..a343b22 100644
_sizeVals[0] = cylinder->radius * 2;
_sizeVals[1] = cylinder->radius * 2;
_sizeVals[2] = cylinder->length;
-@@ -2476,16 +2478,16 @@ std::string GetGeometryBoundingBox(
+@@ -2476,16 +2477,16 @@ std::string GetGeometryBoundingBox(
case urdf::Geometry::SPHERE:
type = "sphere";
{
@@ -218,7 +226,7 @@ index fe9bb9b..a343b22 100644
_sizeVals[0] = mesh->scale.x;
_sizeVals[1] = mesh->scale.y;
_sizeVals[2] = mesh->scale.z;
-@@ -2509,7 +2511,7 @@ void PrintCollisionGroups(UrdfLinkPtr _link)
+@@ -2509,7 +2510,7 @@ void PrintCollisionGroups(UrdfLinkPtr _link)
<< static_cast<int>(_link->collision_groups.size())
<< "] collisions.\n";
for (std::map<std::string,
@@ -227,7 +235,7 @@ index fe9bb9b..a343b22 100644
colsIt = _link->collision_groups.begin();
colsIt != _link->collision_groups.end(); ++colsIt)
{
-@@ -2902,7 +2904,7 @@ void CreateCollisions(TiXmlElement* _elem,
+@@ -2902,7 +2903,7 @@ void CreateCollisions(TiXmlElement* _elem,
// lumped meshes (fixed joint reduction)
#ifndef URDF_GE_0P3
for (std::map<std::string,
@@ -236,7 +244,7 @@ index fe9bb9b..a343b22 100644
collisionsIt = _link->collision_groups.begin();
collisionsIt != _link->collision_groups.end(); ++collisionsIt)
{
-@@ -3024,7 +3026,7 @@ void CreateVisuals(TiXmlElement* _elem,
+@@ -3024,7 +3025,7 @@ void CreateVisuals(TiXmlElement* _elem,
// lumped meshes (fixed joint reduction)
#ifndef URDF_GE_0P3
for (std::map<std::string,
@@ -245,7 +253,7 @@ index fe9bb9b..a343b22 100644
visualsIt = _link->visual_groups.begin();
visualsIt != _link->visual_groups.end(); ++visualsIt)
{
-@@ -3397,7 +3399,7 @@ TiXmlDocument URDF2SDF::InitModelString(const std::string &_urdfStr,
+@@ -3397,7 +3398,7 @@ TiXmlDocument URDF2SDF::InitModelString(const std::string &_urdfStr,
g_enforceLimits = _enforceLimits;
// Create a RobotModel from string
@@ -254,7 +262,7 @@ index fe9bb9b..a343b22 100644
urdf::parseURDF(_urdfStr.c_str());
// an xml object to hold the xml result
-@@ -3439,7 +3441,7 @@ TiXmlDocument URDF2SDF::InitModelString(const std::string &_urdfStr,
+@@ -3439,7 +3440,7 @@ TiXmlDocument URDF2SDF::InitModelString(const std::string &_urdfStr,
// fixed joint lumping only for selected joints
if (g_reduceFixedJoints)
ReduceFixedJoints(robot,
@@ -263,7 +271,7 @@ index fe9bb9b..a343b22 100644
if (rootLink->name == "world")
{
-@@ -3500,7 +3502,7 @@ TiXmlDocument URDF2SDF::InitModelFile(const std::string &_filename)
+@@ -3500,7 +3501,7 @@ TiXmlDocument URDF2SDF::InitModelFile(const std::string &_filename)
}
////////////////////////////////////////////////////////////////////////////////
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git
More information about the debian-science-commits
mailing list