diff options
Diffstat (limited to 'logError_fix.patch')
-rw-r--r-- | logError_fix.patch | 207 |
1 files changed, 207 insertions, 0 deletions
diff --git a/logError_fix.patch b/logError_fix.patch new file mode 100644 index 000000000000..31c39ace151c --- /dev/null +++ b/logError_fix.patch @@ -0,0 +1,207 @@ +Only in patched: build +diff -ura original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/bodies.cpp patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/bodies.cpp +--- original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/bodies.cpp 2017-11-30 16:08:31.000000000 +0100 ++++ patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/bodies.cpp 2018-01-04 22:29:06.515092547 +0100 +@@ -788,7 +788,7 @@ + + if (exitcode != 0) + { +- logWarn("Convex hull creation failed"); ++ CONSOLE_BRIDGE_logWarn("Convex hull creation failed"); + qh_freeqhull (!qh_ALL); + int curlong, totlong; + qh_memfreeshort (&curlong, &totlong); +@@ -1174,7 +1174,7 @@ + { + if (i >= bodies_.size()) + { +- logError("There is no body at index %u", i); ++ CONSOLE_BRIDGE_logError("There is no body at index %u", i); + return; + } + +@@ -1185,7 +1185,7 @@ + { + if (i >= bodies_.size()) + { +- logError("There is no body at index %u", i); ++ CONSOLE_BRIDGE_logError("There is no body at index %u", i); + return NULL; + } + else +diff -ura original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/body_operations.cpp patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/body_operations.cpp +--- original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/body_operations.cpp 2017-11-30 16:08:31.000000000 +0100 ++++ patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/body_operations.cpp 2018-01-04 22:40:18.975848616 +0100 +@@ -59,7 +59,7 @@ + body = new bodies::ConvexMesh(shape); + break; + default: +- logError("Creating body from shape: Unknown shape type %d", (int)shape->type); ++ CONSOLE_BRIDGE_logError("Creating body from shape: Unknown shape type %d", (int)shape->type); + break; + } + +@@ -112,7 +112,7 @@ + Eigen::Quaterniond q(pose.orientation.w, pose.orientation.x, pose.orientation.y, pose.orientation.z); + if (fabs(q.squaredNorm() - 1.0) > 1e-3) + { +- logError("Quaternion is not normalized. Assuming identity."); ++ CONSOLE_BRIDGE_logError("Quaternion is not normalized. Assuming identity."); + q = Eigen::Quaterniond(1.0, 0.0, 0.0, 0.0); + } + Eigen::Affine3d af(Eigen::Translation3d(pose.position.x, pose.position.y, pose.position.z) * q.toRotationMatrix()); +diff -ura original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/mesh_operations.cpp patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/mesh_operations.cpp +--- original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/mesh_operations.cpp 2017-11-30 16:08:31.000000000 +0100 ++++ patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/mesh_operations.cpp 2018-01-04 22:29:06.515092547 +0100 +@@ -133,7 +133,7 @@ + return NULL; + + if (source.size() % 3 != 0) +- logError("The number of vertices to construct a mesh from is not divisible by 3. Probably constructed triangles will not make sense."); ++ CONSOLE_BRIDGE_logError("The number of vertices to construct a mesh from is not divisible by 3. Probably constructed triangles will not make sense."); + + std::set<detail::LocalVertexType, detail::ltLocalVertexValue> vertices; + std::vector<unsigned int> triangles; +@@ -220,7 +220,7 @@ + { + if (!buffer || size < 1) + { +- logWarn("Cannot construct mesh from empty binary buffer"); ++ CONSOLE_BRIDGE_logWarn("Cannot construct mesh from empty binary buffer"); + return NULL; + } + +@@ -285,21 +285,21 @@ + } + catch (resource_retriever::Exception& e) + { +- logError("%s", e.what()); ++ CONSOLE_BRIDGE_logError("%s", e.what()); + return NULL; + } + + if (res.size == 0) + { +- logWarn("Retrieved empty mesh for resource '%s'", resource.c_str()); ++ CONSOLE_BRIDGE_logWarn("Retrieved empty mesh for resource '%s'", resource.c_str()); + return NULL; + } + + Mesh *m = createMeshFromBinary(reinterpret_cast<const char*>(res.data.get()), res.size, scale, resource); + if (!m) + { +- logWarn("Assimp reports no scene in %s.", resource.c_str()); +- logWarn("This could be because of a resource filename that is too long for the Assimp library, a known bug. As a workaround shorten the filename/path."); ++ CONSOLE_BRIDGE_logWarn("Assimp reports no scene in %s.", resource.c_str()); ++ CONSOLE_BRIDGE_logWarn("This could be because of a resource filename that is too long for the Assimp library, a known bug. As a workaround shorten the filename/path."); + } + return m; + } +@@ -344,7 +344,7 @@ + { + if (!scene->HasMeshes()) + { +- logWarn("Assimp reports scene in %s has no meshes", resource_name.c_str()); ++ CONSOLE_BRIDGE_logWarn("Assimp reports scene in %s has no meshes", resource_name.c_str()); + return NULL; + } + EigenSTL::vector_Vector3d vertices; +@@ -352,12 +352,12 @@ + extractMeshData(scene, scene->mRootNode, aiMatrix4x4(), scale, vertices, triangles); + if (vertices.empty()) + { +- logWarn("There are no vertices in the scene %s", resource_name.c_str()); ++ CONSOLE_BRIDGE_logWarn("There are no vertices in the scene %s", resource_name.c_str()); + return NULL; + } + if (triangles.empty()) + { +- logWarn("There are no triangles in the scene %s", resource_name.c_str()); ++ CONSOLE_BRIDGE_logWarn("There are no triangles in the scene %s", resource_name.c_str()); + return NULL; + } + +@@ -378,7 +378,7 @@ + if (shape->type == shapes::CONE) + return shapes::createMeshFromShape(static_cast<const shapes::Cone&>(*shape)); + else +- logError("Conversion of shape of type '%s' to a mesh is not known", shapeStringName(shape).c_str()); ++ CONSOLE_BRIDGE_logError("Conversion of shape of type '%s' to a mesh is not known", shapeStringName(shape).c_str()); + return NULL; + } + +diff -ura original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shape_operations.cpp patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shape_operations.cpp +--- original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shape_operations.cpp 2017-11-30 16:08:31.000000000 +0100 ++++ patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shape_operations.cpp 2018-01-04 22:29:06.515092547 +0100 +@@ -62,7 +62,7 @@ + { + if (shape_msg.triangles.empty() || shape_msg.vertices.empty()) + { +- logWarn("Mesh definition is empty"); ++ CONSOLE_BRIDGE_logWarn("Mesh definition is empty"); + return NULL; + } + else +@@ -117,7 +117,7 @@ + shape_msg.dimensions[shape_msgs::SolidPrimitive::CONE_HEIGHT]); + } + if (shape == NULL) +- logError("Unable to construct shape corresponding to shape_msg of type %d", (int)shape_msg.type); ++ CONSOLE_BRIDGE_logError("Unable to construct shape corresponding to shape_msg of type %d", (int)shape_msg.type); + + return shape; + } +@@ -202,7 +202,7 @@ + } + catch (std::runtime_error &ex) + { +- logError("%s", ex.what()); ++ CONSOLE_BRIDGE_logError("%s", ex.what()); + } + if (ok) + return true; +@@ -451,7 +451,7 @@ + } + else + { +- logError("Unable to construct shape message for shape of type %d", (int)shape->type); ++ CONSOLE_BRIDGE_logError("Unable to construct shape message for shape of type %d", (int)shape->type); + return false; + } + +@@ -512,7 +512,7 @@ + } + else + { +- logError("Unable to save shape of type %d", (int)shape->type); ++ CONSOLE_BRIDGE_logError("Unable to save shape of type %d", (int)shape->type); + } + } + +@@ -580,7 +580,7 @@ + m->computeVertexNormals(); + } + else +- logError("Unknown shape type: '%s'", type.c_str()); ++ CONSOLE_BRIDGE_logError("Unknown shape type: '%s'", type.c_str()); + } + } + return result; +diff -ura original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shapes.cpp patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shapes.cpp +--- original/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shapes.cpp 2017-11-30 16:08:31.000000000 +0100 ++++ patched/geometric_shapes-release-release-lunar-geometric_shapes-0.5.3-0/src/shapes.cpp 2018-01-04 22:29:06.515092547 +0100 +@@ -224,12 +224,12 @@ + + void shapes::OcTree::scaleAndPadd(double scale, double padd) + { +- logWarn("OcTrees cannot be scaled or padded"); ++ CONSOLE_BRIDGE_logWarn("OcTrees cannot be scaled or padded"); + } + + void shapes::Plane::scaleAndPadd(double scale, double padding) + { +- logWarn("Planes cannot be scaled or padded"); ++ CONSOLE_BRIDGE_logWarn("Planes cannot be scaled or padded"); + } + + void shapes::Shape::scale(double scale) |