hiep update
This commit is contained in:
@@ -29,8 +29,8 @@
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
#ifndef LASER_GEOMETRY__LASER_GEOMETRY_HPP_
|
||||
#define LASER_GEOMETRY__LASER_GEOMETRY_HPP_
|
||||
#ifndef ROBOT_LASER_GEOMETRY_ROBOT_LASER_GEOMETRY_HPP_
|
||||
#define ROBOT_LASER_GEOMETRY_ROBOT_LASER_GEOMETRY_HPP_
|
||||
|
||||
#include <map>
|
||||
#include <iostream>
|
||||
@@ -43,9 +43,9 @@
|
||||
#include <robot_sensor_msgs/LaserScan.h>
|
||||
#include <robot_sensor_msgs/PointCloud2.h>
|
||||
#include <robot_geometry_msgs/TransformStamped.h>
|
||||
#include "laser_geometry/visibility_control.hpp"
|
||||
#include "robot_laser_geometry/visibility_control.hpp"
|
||||
|
||||
namespace laser_geometry
|
||||
namespace robot_laser_geometry
|
||||
{
|
||||
// NOTE: invalid scan errors (will be present in LaserScan.msg in D-Turtle)
|
||||
const float LASER_SCAN_INVALID = -1.0;
|
||||
@@ -96,7 +96,7 @@ enum ChannelOption
|
||||
*/
|
||||
|
||||
// TODO(Martin-Idel-SI): the support for PointCloud1 has been removed for now.
|
||||
// Refer to the GitHub issue #29: https://github.com/ros-perception/laser_geometry/issues/29
|
||||
// Refer to the GitHub issue #29: https://github.com/ros-perception/robot_laser_geometry/issues/29
|
||||
|
||||
class LaserProjection
|
||||
{
|
||||
@@ -120,7 +120,7 @@ public:
|
||||
* channel_option::Intensity, channel_option::Index,
|
||||
* channel_option::Distance, channel_option::Timestamp.
|
||||
*/
|
||||
LASER_GEOMETRY_PUBLIC
|
||||
ROBOT_LASER_GEOMETRY_PUBLIC
|
||||
void projectLaser(
|
||||
const robot_sensor_msgs::LaserScan & scan_in,
|
||||
robot_sensor_msgs::PointCloud2 & cloud_out,
|
||||
@@ -152,7 +152,7 @@ public:
|
||||
* channel_option::Intensity, channel_option::Index,
|
||||
* channel_option::Distance, channel_option::Timestamp.
|
||||
*/
|
||||
LASER_GEOMETRY_PUBLIC
|
||||
ROBOT_LASER_GEOMETRY_PUBLIC
|
||||
void transformLaserScanToPointCloud(
|
||||
const std::string & target_frame,
|
||||
const robot_sensor_msgs::LaserScan & scan_in,
|
||||
@@ -200,6 +200,6 @@ private:
|
||||
Eigen::ArrayXXd co_sine_map_;
|
||||
};
|
||||
|
||||
} // namespace laser_geometry
|
||||
} // namespace robot_laser_geometry
|
||||
|
||||
#endif // LASER_GEOMETRY__LASER_GEOMETRY_HPP_
|
||||
#endif // ROBOT_LASER_GEOMETRY__ROBOT_LASER_GEOMETRY_HPP_
|
||||
@@ -27,38 +27,38 @@
|
||||
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#ifndef LASER_GEOMETRY__VISIBILITY_CONTROL_HPP_
|
||||
#define LASER_GEOMETRY__VISIBILITY_CONTROL_HPP_
|
||||
#ifndef ROBOT_LASER_GEOMETRY_VISIBILITY_CONTROL_HPP_
|
||||
#define ROBOT_LASER_GEOMETRY_VISIBILITY_CONTROL_HPP_
|
||||
|
||||
// This logic was borrowed (then namespaced) from the examples on the gcc wiki:
|
||||
// https://gcc.gnu.org/wiki/Visibility
|
||||
|
||||
#if defined _WIN32 || defined __CYGWIN__
|
||||
#ifdef __GNUC__
|
||||
#define LASER_GEOMETRY_EXPORT __attribute__ ((dllexport))
|
||||
#define LASER_GEOMETRY_IMPORT __attribute__ ((dllimport))
|
||||
#define ROBOT_LASER_GEOMETRY_EXPORT __attribute__ ((dllexport))
|
||||
#define ROBOT_LASER_GEOMETRY_IMPORT __attribute__ ((dllimport))
|
||||
#else
|
||||
#define LASER_GEOMETRY_EXPORT __declspec(dllexport)
|
||||
#define LASER_GEOMETRY_IMPORT __declspec(dllimport)
|
||||
#define ROBOT_LASER_GEOMETRY_EXPORT __declspec(dllexport)
|
||||
#define ROBOT_LASER_GEOMETRY_IMPORT __declspec(dllimport)
|
||||
#endif
|
||||
#ifdef LASER_GEOMETRY_BUILDING_LIBRARY
|
||||
#define LASER_GEOMETRY_PUBLIC LASER_GEOMETRY_EXPORT
|
||||
#ifdef ROBOT_LASER_GEOMETRY_BUILDING_LIBRARY
|
||||
#define ROBOT_LASER_GEOMETRY_PUBLIC ROBOT_LASER_GEOMETRY_EXPORT
|
||||
#else
|
||||
#define LASER_GEOMETRY_PUBLIC LASER_GEOMETRY_IMPORT
|
||||
#define ROBOT_LASER_GEOMETRY_PUBLIC ROBOT_LASER_GEOMETRY_IMPORT
|
||||
#endif
|
||||
#define LASER_GEOMETRY_PUBLIC_TYPE LASER_GEOMETRY_PUBLIC
|
||||
#define LASER_GEOMETRY_LOCAL
|
||||
#define ROBOT_LASER_GEOMETRY_PUBLIC_TYPE ROBOT_LASER_GEOMETRY_PUBLIC
|
||||
#define ROBOT_LASER_GEOMETRY_LOCAL
|
||||
#else
|
||||
#define LASER_GEOMETRY_EXPORT __attribute__ ((visibility("default")))
|
||||
#define LASER_GEOMETRY_IMPORT
|
||||
#define ROBOT_LASER_GEOMETRY_EXPORT __attribute__ ((visibility("default")))
|
||||
#define ROBOT_LASER_GEOMETRY_IMPORT
|
||||
#if __GNUC__ >= 4
|
||||
#define LASER_GEOMETRY_PUBLIC __attribute__ ((visibility("default")))
|
||||
#define LASER_GEOMETRY_LOCAL __attribute__ ((visibility("hidden")))
|
||||
#define ROBOT_LASER_GEOMETRY_PUBLIC __attribute__ ((visibility("default")))
|
||||
#define ROBOT_LASER_GEOMETRY_LOCAL __attribute__ ((visibility("hidden")))
|
||||
#else
|
||||
#define LASER_GEOMETRY_PUBLIC
|
||||
#define LASER_GEOMETRY_LOCAL
|
||||
#define ROBOT_LASER_GEOMETRY_PUBLIC
|
||||
#define ROBOT_LASER_GEOMETRY_LOCAL
|
||||
#endif
|
||||
#define LASER_GEOMETRY_PUBLIC_TYPE
|
||||
#define ROBOT_LASER_GEOMETRY_PUBLIC_TYPE
|
||||
#endif
|
||||
|
||||
#endif // LASER_GEOMETRY__VISIBILITY_CONTROL_HPP_
|
||||
#endif // ROBOT_LASER_GEOMETRY__VISIBILITY_CONTROL_HPP_
|
||||
Reference in New Issue
Block a user