diff options
Diffstat (limited to 'logError_fix.patch')
| -rw-r--r-- | logError_fix.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/logError_fix.patch b/logError_fix.patch new file mode 100644 index 000000000000..ac1ca4e50742 --- /dev/null +++ b/logError_fix.patch @@ -0,0 +1,97 @@ +diff -ura original/geometry2-release-release-lunar-tf2-0.5.17-0/src/buffer_core.cpp patched/geometry2-release-release-lunar-tf2-0.5.17-0/src/buffer_core.cpp +--- original/geometry2-release-release-lunar-tf2-0.5.17-0/src/buffer_core.cpp 2018-01-02 07:46:40.000000000 +0100 ++++ patched/geometry2-release-release-lunar-tf2-0.5.17-0/src/buffer_core.cpp 2018-01-04 23:00:01.622880799 +0100 +@@ -123,7 +123,7 @@ + { + std::stringstream ss; + ss << "Invalid argument passed to "<< function_name_arg <<" in tf2 frame_ids cannot be empty"; +- logWarn("%s",ss.str().c_str()); ++ CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str()); + return true; + } + +@@ -131,7 +131,7 @@ + { + std::stringstream ss; + ss << "Invalid argument \"" << frame_id << "\" passed to "<< function_name_arg <<" in tf2 frame_ids cannot start with a '/' like: "; +- logWarn("%s",ss.str().c_str()); ++ CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str()); + return true; + } + +@@ -218,26 +218,26 @@ + bool error_exists = false; + if (stripped.child_frame_id == stripped.header.frame_id) + { +- logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id \"%s\" because they are the same", authority.c_str(), stripped.child_frame_id.c_str()); ++ CONSOLE_BRIDGE_logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id \"%s\" because they are the same", authority.c_str(), stripped.child_frame_id.c_str()); + error_exists = true; + } + + if (stripped.child_frame_id == "") + { +- logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str()); ++ CONSOLE_BRIDGE_logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str()); + error_exists = true; + } + + if (stripped.header.frame_id == "") + { +- logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\" from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str()); ++ CONSOLE_BRIDGE_logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\" from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str()); + error_exists = true; + } + + if (std::isnan(stripped.transform.translation.x) || std::isnan(stripped.transform.translation.y) || std::isnan(stripped.transform.translation.z)|| + std::isnan(stripped.transform.rotation.x) || std::isnan(stripped.transform.rotation.y) || std::isnan(stripped.transform.rotation.z) || std::isnan(stripped.transform.rotation.w)) + { +- logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)", ++ CONSOLE_BRIDGE_logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)", + stripped.child_frame_id.c_str(), authority.c_str(), + stripped.transform.translation.x, stripped.transform.translation.y, stripped.transform.translation.z, + stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w +@@ -252,7 +252,7 @@ + + if (!valid) + { +- logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)", ++ CONSOLE_BRIDGE_logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)", + stripped.child_frame_id.c_str(), authority.c_str(), + stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w); + error_exists = true; +@@ -274,7 +274,7 @@ + } + else + { +- logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str()); ++ CONSOLE_BRIDGE_logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str()); + return false; + } + } +@@ -633,7 +633,7 @@ + case tf2_msgs::TF2Error::LOOKUP_ERROR: + throw LookupException(error_string); + default: +- logError("Unknown error code: %d", retval); ++ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval); + assert(0); + } + } +@@ -1604,7 +1604,7 @@ + case tf2_msgs::TF2Error::LOOKUP_ERROR: + throw LookupException(error_string); + default: +- logError("Unknown error code: %d", retval); ++ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval); + assert(0); + } + } +@@ -1623,7 +1623,7 @@ + case tf2_msgs::TF2Error::LOOKUP_ERROR: + throw LookupException(error_string); + default: +- logError("Unknown error code: %d", retval); ++ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval); + assert(0); + } + } |