New Upstream Snapshot - ros-image-common
Ready changes
Summary
Merged new upstream version: 1.12.0+git20220621.1.cd57529 (was: 1.12.0).
Resulting package
Built on 2022-12-20T08:33 (took 13m16s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots camera-calibration-parsers-tools-dbgsymapt install -t fresh-snapshots camera-calibration-parsers-toolsapt install -t fresh-snapshots cl-polled-cameraapt install -t fresh-snapshots image-transport-tools-dbgsymapt install -t fresh-snapshots image-transport-toolsapt install -t fresh-snapshots libcamera-calibration-parsers-devapt install -t fresh-snapshots libcamera-calibration-parsers0d-dbgsymapt install -t fresh-snapshots libcamera-calibration-parsers0dapt install -t fresh-snapshots libcamera-info-manager-devapt install -t fresh-snapshots libcamera-info-manager0d-dbgsymapt install -t fresh-snapshots libcamera-info-manager0dapt install -t fresh-snapshots libimage-transport-devapt install -t fresh-snapshots libimage-transport0d-dbgsymapt install -t fresh-snapshots libimage-transport0dapt install -t fresh-snapshots libpolled-camera-devapt install -t fresh-snapshots libpolled-camera0d-dbgsymapt install -t fresh-snapshots libpolled-camera0dapt install -t fresh-snapshots polled-camera-tool-dbgsymapt install -t fresh-snapshots polled-camera-toolapt install -t fresh-snapshots python3-camera-calibration-parsers-dbgsymapt install -t fresh-snapshots python3-camera-calibration-parsersapt install -t fresh-snapshots python3-polled-camera
Lintian Result
- camera-calibration-parsers-tools-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- camera-calibration-parsers-tools_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- cl-polled-camera_1.12.0+git20220621.1.cd57529-1~jan+nus3_all.deb
- image-transport-tools-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- image-transport-tools_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libcamera-calibration-parsers-dev_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libcamera-calibration-parsers0d-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libcamera-calibration-parsers0d_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libcamera-info-manager-dev_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libcamera-info-manager0d-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libcamera-info-manager0d_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libimage-transport-dev_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libimage-transport0d-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libimage-transport0d_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libpolled-camera-dev_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libpolled-camera0d-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- libpolled-camera0d_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- polled-camera-tool-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- polled-camera-tool_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- python3-camera-calibration-parsers-dbgsym_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- python3-camera-calibration-parsers_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.deb
- python3-polled-camera_1.12.0+git20220621.1.cd57529-1~jan+nus3_all.deb
- ros-image-common_1.12.0+git20220621.1.cd57529-1~jan+nus3.dsc
- ros-image-common_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.buildinfo
- ros-image-common_1.12.0+git20220621.1.cd57529-1~jan+nus3_amd64.changes
Diff
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b3421b0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pyc
-.*
diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
index ddf9d1f..bd6ac24 100644
--- a/camera_info_manager/CMakeLists.txt
+++ b/camera_info_manager/CMakeLists.txt
@@ -10,8 +10,8 @@ catkin_package(INCLUDE_DIRS include
DEPENDS Boost roscpp sensor_msgs
)
-include_directories(${catkin_INCLUDE_DIRS})
include_directories(include)
+include_directories(${catkin_INCLUDE_DIRS})
# add a library
add_library(${PROJECT_NAME} src/camera_info_manager.cpp)
diff --git a/camera_info_manager/include/camera_info_manager/camera_info_manager.h b/camera_info_manager/include/camera_info_manager/camera_info_manager.h
index 530c485..c74ed1e 100644
--- a/camera_info_manager/include/camera_info_manager/camera_info_manager.h
+++ b/camera_info_manager/include/camera_info_manager/camera_info_manager.h
@@ -192,15 +192,16 @@ class CAMERA_INFO_MANAGER_DECL CameraInfoManager
CameraInfoManager(ros::NodeHandle nh,
const std::string &cname="camera",
const std::string &url="");
-
- sensor_msgs::CameraInfo getCameraInfo(void);
- bool isCalibrated(void);
- bool loadCameraInfo(const std::string &url);
- std::string resolveURL(const std::string &url,
- const std::string &cname);
- bool setCameraName(const std::string &cname);
- bool setCameraInfo(const sensor_msgs::CameraInfo &camera_info);
- bool validateURL(const std::string &url);
+ virtual ~CameraInfoManager();
+
+ virtual sensor_msgs::CameraInfo getCameraInfo(void);
+ virtual bool isCalibrated(void);
+ virtual bool loadCameraInfo(const std::string &url);
+ virtual std::string resolveURL(const std::string &url,
+ const std::string &cname);
+ virtual bool setCameraName(const std::string &cname);
+ virtual bool setCameraInfo(const sensor_msgs::CameraInfo &camera_info);
+ virtual bool validateURL(const std::string &url);
private:
@@ -218,19 +219,24 @@ class CAMERA_INFO_MANAGER_DECL CameraInfoManager
// private methods
std::string getPackageFileName(const std::string &url);
- bool loadCalibration(const std::string &url,
- const std::string &cname);
- bool loadCalibrationFile(const std::string &filename,
- const std::string &cname);
+ virtual bool loadCalibration(const std::string &url,
+ const std::string &cname);
+ virtual bool loadCalibrationFile(const std::string &filename,
+ const std::string &cname);
+ virtual bool loadCalibrationFlash(const std::string &flashURL,
+ const std::string &cname);
url_type_t parseURL(const std::string &url);
- bool saveCalibration(const sensor_msgs::CameraInfo &new_info,
- const std::string &url,
- const std::string &cname);
- bool saveCalibrationFile(const sensor_msgs::CameraInfo &new_info,
- const std::string &filename,
- const std::string &cname);
- bool setCameraInfoService(sensor_msgs::SetCameraInfo::Request &req,
- sensor_msgs::SetCameraInfo::Response &rsp);
+ virtual bool saveCalibration(const sensor_msgs::CameraInfo &new_info,
+ const std::string &url,
+ const std::string &cname);
+ virtual bool saveCalibrationFile(const sensor_msgs::CameraInfo &new_info,
+ const std::string &filename,
+ const std::string &cname);
+ virtual bool saveCalibrationFlash(const sensor_msgs::CameraInfo &new_info,
+ const std::string &flashURL,
+ const std::string &cname);
+ virtual bool setCameraInfoService(sensor_msgs::SetCameraInfo::Request &req,
+ sensor_msgs::SetCameraInfo::Response &rsp);
/** @brief mutual exclusion lock for private data
*
@@ -252,6 +258,6 @@ class CAMERA_INFO_MANAGER_DECL CameraInfoManager
}; // class CameraInfoManager
-}; // namespace camera_info_manager
+} // namespace camera_info_manager
#endif // _CAMERA_INFO_MANAGER_H_
diff --git a/camera_info_manager/src/camera_info_manager.cpp b/camera_info_manager/src/camera_info_manager.cpp
index 3395453..b97b404 100644
--- a/camera_info_manager/src/camera_info_manager.cpp
+++ b/camera_info_manager/src/camera_info_manager.cpp
@@ -73,6 +73,8 @@ using namespace camera_calibration_parsers;
const std::string
default_camera_info_url = "file://${ROS_HOME}/camera_info/${NAME}.yaml";
+ CameraInfoManager::~CameraInfoManager() {}
+
/** Constructor
*
* @param nh node handle, normally for the driver's streaming name
@@ -242,7 +244,7 @@ bool CameraInfoManager::loadCalibration(const std::string &url,
}
case URL_flash:
{
- ROS_WARN("[CameraInfoManager] reading from flash not implemented yet");
+ success = loadCalibrationFlash(resURL.substr(8), cname);
break;
}
case URL_package:
@@ -303,6 +305,12 @@ bool CameraInfoManager::loadCalibrationFile(const std::string &filename,
return success;
}
+bool CameraInfoManager::loadCalibrationFlash(const std::string &flashURL,
+ const std::string &cname) {
+ ROS_WARN("[CameraInfoManager] reading from flash not implemented for this CameraInfoManager");
+ return false;
+}
+
/** Set a new URL and load its calibration data (if any).
*
* If multiple threads call this method simultaneously with different
@@ -475,6 +483,11 @@ CameraInfoManager::saveCalibration(const sensor_msgs::CameraInfo &new_info,
success = saveCalibrationFile(new_info, filename, cname);
break;
}
+ case URL_flash:
+ {
+ success = saveCalibrationFlash(new_info, resURL.substr(8), cname);
+ break;
+ }
default:
{
// invalid URL, save to default location
@@ -486,7 +499,7 @@ CameraInfoManager::saveCalibration(const sensor_msgs::CameraInfo &new_info,
return success;
}
-
+
/** Save CameraInfo calibration data to a file.
*
* @pre mutex_ unlocked
@@ -553,6 +566,13 @@ CameraInfoManager::saveCalibrationFile(const sensor_msgs::CameraInfo &new_info,
return writeCalibration(filename, cname, new_info);
}
+bool CameraInfoManager::saveCalibrationFlash(const sensor_msgs::CameraInfo &new_info,
+ const std::string &flashURL,
+ const std::string &cname) {
+ ROS_ERROR_STREAM("flash url: " << flashURL << " (ignored)");
+ return saveCalibration(new_info, default_camera_info_url, cname);
+}
+
/** Callback for SetCameraInfo request.
*
* Always updates cam_info_ class variable, even if save fails.
diff --git a/debian/changelog b/debian/changelog
index 54a9ff0..8be766f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ros-image-common (1.12.0+git20220621.1.cd57529-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch 0004-Switch-to-new-boost-bind-bind.hpp.patch, present upstream.
+ * Drop patch 0005-Switch-to-hpp-headers-of-pluginlib.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 20 Dec 2022 08:22:29 -0000
+
ros-image-common (1.12.0-12) unstable; urgency=medium
* Drop nose dependency (Closes: #1018627)
diff --git a/debian/patches/0001-Add-CMakeLists.txt.patch b/debian/patches/0001-Add-CMakeLists.txt.patch
index 5496b16..aa69d97 100644
--- a/debian/patches/0001-Add-CMakeLists.txt.patch
+++ b/debian/patches/0001-Add-CMakeLists.txt.patch
@@ -7,11 +7,10 @@ Subject: Add CMakeLists.txt
1 file changed, 7 insertions(+)
create mode 100644 CMakeLists.txt
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..00b0393
+Index: ros-image-common.git/CMakeLists.txt
+===================================================================
--- /dev/null
-+++ b/CMakeLists.txt
++++ ros-image-common.git/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(image_common)
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index 2fe6753..66087ca 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -9,10 +9,10 @@ Subject: Add Debian specific SOVERSION
polled_camera/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 1 deletion(-)
-diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index 4f08187..12ce500 100644
---- a/camera_calibration_parsers/CMakeLists.txt
-+++ b/camera_calibration_parsers/CMakeLists.txt
+Index: ros-image-common.git/camera_calibration_parsers/CMakeLists.txt
+===================================================================
+--- ros-image-common.git.orig/camera_calibration_parsers/CMakeLists.txt
++++ ros-image-common.git/camera_calibration_parsers/CMakeLists.txt
@@ -41,6 +41,7 @@ add_library(${PROJECT_NAME}_wrapper
src/parse_wrapper.cpp)
@@ -21,11 +21,11 @@ index 4f08187..12ce500 100644
target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
# Don't prepend wrapper library name with lib and add to Python libs.
-diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
-index ddf9d1f..ba7b544 100644
---- a/camera_info_manager/CMakeLists.txt
-+++ b/camera_info_manager/CMakeLists.txt
-@@ -16,6 +16,7 @@ include_directories(include)
+Index: ros-image-common.git/camera_info_manager/CMakeLists.txt
+===================================================================
+--- ros-image-common.git.orig/camera_info_manager/CMakeLists.txt
++++ ros-image-common.git/camera_info_manager/CMakeLists.txt
+@@ -16,6 +16,7 @@ include_directories(${catkin_INCLUDE_DIR
# add a library
add_library(${PROJECT_NAME} src/camera_info_manager.cpp)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
@@ -33,10 +33,10 @@ index ddf9d1f..ba7b544 100644
install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-diff --git a/image_transport/CMakeLists.txt b/image_transport/CMakeLists.txt
-index 578205b..31d7c98 100644
---- a/image_transport/CMakeLists.txt
-+++ b/image_transport/CMakeLists.txt
+Index: ros-image-common.git/image_transport/CMakeLists.txt
+===================================================================
+--- ros-image-common.git.orig/image_transport/CMakeLists.txt
++++ ros-image-common.git/image_transport/CMakeLists.txt
@@ -32,6 +32,7 @@ add_library(${PROJECT_NAME}
src/subscriber.cpp
)
@@ -45,10 +45,10 @@ index 578205b..31d7c98 100644
target_link_libraries(${PROJECT_NAME}
${Boost_LIBRARIES}
${catkin_LIBRARIES}
-diff --git a/polled_camera/CMakeLists.txt b/polled_camera/CMakeLists.txt
-index 9e2645d..90df0e0 100644
---- a/polled_camera/CMakeLists.txt
-+++ b/polled_camera/CMakeLists.txt
+Index: ros-image-common.git/polled_camera/CMakeLists.txt
+===================================================================
+--- ros-image-common.git.orig/polled_camera/CMakeLists.txt
++++ ros-image-common.git/polled_camera/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(include
add_library(${PROJECT_NAME} src/publication_server.cpp)
add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS} ${${PROJECT_NAME}_EXPORTED_TARGETS})
diff --git a/debian/patches/0003-Make-Python-version-variable-for-pybuild.patch b/debian/patches/0003-Make-Python-version-variable-for-pybuild.patch
index cae5e16..2393206 100644
--- a/debian/patches/0003-Make-Python-version-variable-for-pybuild.patch
+++ b/debian/patches/0003-Make-Python-version-variable-for-pybuild.patch
@@ -6,10 +6,10 @@ Subject: Make Python version variable for pybuild
camera_calibration_parsers/CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index 12ce500..0cf829d 100644
---- a/camera_calibration_parsers/CMakeLists.txt
-+++ b/camera_calibration_parsers/CMakeLists.txt
+Index: ros-image-common.git/camera_calibration_parsers/CMakeLists.txt
+===================================================================
+--- ros-image-common.git.orig/camera_calibration_parsers/CMakeLists.txt
++++ ros-image-common.git/camera_calibration_parsers/CMakeLists.txt
@@ -4,7 +4,8 @@ project(camera_calibration_parsers)
find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization)
diff --git a/debian/patches/0004-Switch-to-new-boost-bind-bind.hpp.patch b/debian/patches/0004-Switch-to-new-boost-bind-bind.hpp.patch
deleted file mode 100644
index 1f8da17..0000000
--- a/debian/patches/0004-Switch-to-new-boost-bind-bind.hpp.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Mon, 14 Dec 2020 11:28:31 +0100
-Subject: Switch to new boost/bind/bind.hpp
-
----
- image_transport/include/image_transport/image_transport.h | 8 ++++----
- image_transport/include/image_transport/simple_publisher_plugin.h | 8 ++++----
- .../include/image_transport/simple_subscriber_plugin.h | 2 +-
- image_transport/include/image_transport/subscriber_filter.h | 2 +-
- image_transport/include/image_transport/subscriber_plugin.h | 4 ++--
- image_transport/src/camera_subscriber.cpp | 2 +-
- image_transport/src/publisher.cpp | 2 +-
- image_transport/src/republish.cpp | 4 ++--
- polled_camera/include/polled_camera/publication_server.h | 4 ++--
- polled_camera/src/publication_server.cpp | 2 +-
- 10 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/image_transport/include/image_transport/image_transport.h b/image_transport/include/image_transport/image_transport.h
-index 9a542e6..e20e1f8 100644
---- a/image_transport/include/image_transport/image_transport.h
-+++ b/image_transport/include/image_transport/image_transport.h
-@@ -97,7 +97,7 @@ public:
- void(T::*fp)(const sensor_msgs::ImageConstPtr&), T* obj,
- const TransportHints& transport_hints = TransportHints())
- {
-- return subscribe(base_topic, queue_size, boost::bind(fp, obj, _1), ros::VoidPtr(), transport_hints);
-+ return subscribe(base_topic, queue_size, boost::bind(fp, obj, boost::placeholders::_1), ros::VoidPtr(), transport_hints);
- }
-
- /**
-@@ -109,7 +109,7 @@ public:
- const boost::shared_ptr<T>& obj,
- const TransportHints& transport_hints = TransportHints())
- {
-- return subscribe(base_topic, queue_size, boost::bind(fp, obj.get(), _1), obj, transport_hints);
-+ return subscribe(base_topic, queue_size, boost::bind(fp, obj.get(), boost::placeholders::_1), obj, transport_hints);
- }
-
- /*!
-@@ -162,7 +162,7 @@ public:
- const sensor_msgs::CameraInfoConstPtr&), T* obj,
- const TransportHints& transport_hints = TransportHints())
- {
-- return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj, _1, _2), ros::VoidPtr(),
-+ return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj, boost::placeholders::_1, boost::placeholders::_2), ros::VoidPtr(),
- transport_hints);
- }
-
-@@ -177,7 +177,7 @@ public:
- const boost::shared_ptr<T>& obj,
- const TransportHints& transport_hints = TransportHints())
- {
-- return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj.get(), _1, _2), obj,
-+ return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj.get(), boost::placeholders::_1, boost::placeholders::_2), obj,
- transport_hints);
- }
-
-diff --git a/image_transport/include/image_transport/simple_publisher_plugin.h b/image_transport/include/image_transport/simple_publisher_plugin.h
-index 691d2ed..352c58b 100644
---- a/image_transport/include/image_transport/simple_publisher_plugin.h
-+++ b/image_transport/include/image_transport/simple_publisher_plugin.h
-@@ -185,9 +185,9 @@ private:
- ros::SubscriberStatusCallback bindCB(const SubscriberStatusCallback& user_cb,
- SubscriberStatusMemFn internal_cb_fn)
- {
-- ros::SubscriberStatusCallback internal_cb = boost::bind(internal_cb_fn, this, _1);
-+ ros::SubscriberStatusCallback internal_cb = boost::bind(internal_cb_fn, this, boost::placeholders::_1);
- if (user_cb)
-- return boost::bind(&SimplePublisherPlugin::subscriberCB, this, _1, user_cb, internal_cb);
-+ return boost::bind(&SimplePublisherPlugin::subscriberCB, this, boost::placeholders::_1, user_cb, internal_cb);
- else
- return internal_cb;
- }
-@@ -209,7 +209,7 @@ private:
- // messages of the transport-specific type.
- typedef void (SimplePublisherPlugin::*PublishMemFn)(const sensor_msgs::Image&, const PublishFn&) const;
- PublishMemFn pub_mem_fn = &SimplePublisherPlugin::publish;
-- ImagePublishFn image_publish_fn = boost::bind(pub_mem_fn, this, _1, bindInternalPublisher(ros_ssp));
-+ ImagePublishFn image_publish_fn = boost::bind(pub_mem_fn, this, boost::placeholders::_1, bindInternalPublisher(ros_ssp));
-
- SingleSubscriberPublisher ssp(ros_ssp.getSubscriberName(), getTopic(),
- boost::bind(&SimplePublisherPlugin::getNumSubscribers, this),
-@@ -231,7 +231,7 @@ private:
- // Bind PubT::publish(const Message&) as PublishFn
- typedef void (PubT::*InternalPublishMemFn)(const M&) const;
- InternalPublishMemFn internal_pub_mem_fn = &PubT::publish;
-- return boost::bind(internal_pub_mem_fn, &pub, _1);
-+ return boost::bind(internal_pub_mem_fn, &pub, boost::placeholders::_1);
- }
- };
-
-diff --git a/image_transport/include/image_transport/simple_subscriber_plugin.h b/image_transport/include/image_transport/simple_subscriber_plugin.h
-index dd6ea3c..b0400ad 100644
---- a/image_transport/include/image_transport/simple_subscriber_plugin.h
-+++ b/image_transport/include/image_transport/simple_subscriber_plugin.h
-@@ -109,7 +109,7 @@ protected:
- simple_impl_.reset(new SimpleSubscriberPluginImpl(param_nh));
-
- simple_impl_->sub_ = nh.subscribe<M>(getTopicToSubscribe(base_topic), queue_size,
-- boost::bind(&SimpleSubscriberPlugin::internalCallback, this, _1, callback),
-+ boost::bind(&SimpleSubscriberPlugin::internalCallback, this, boost::placeholders::_1, callback),
- tracked_object, transport_hints.getRosHints());
- }
-
-diff --git a/image_transport/include/image_transport/subscriber_filter.h b/image_transport/include/image_transport/subscriber_filter.h
-index 3d5be7b..356a729 100644
---- a/image_transport/include/image_transport/subscriber_filter.h
-+++ b/image_transport/include/image_transport/subscriber_filter.h
-@@ -107,7 +107,7 @@ public:
- {
- unsubscribe();
-
-- sub_ = it.subscribe(base_topic, queue_size, boost::bind(&SubscriberFilter::cb, this, _1),
-+ sub_ = it.subscribe(base_topic, queue_size, boost::bind(&SubscriberFilter::cb, this, boost::placeholders::_1),
- ros::VoidPtr(), transport_hints);
- }
-
-diff --git a/image_transport/include/image_transport/subscriber_plugin.h b/image_transport/include/image_transport/subscriber_plugin.h
-index 4601dc9..97bc58b 100644
---- a/image_transport/include/image_transport/subscriber_plugin.h
-+++ b/image_transport/include/image_transport/subscriber_plugin.h
-@@ -88,7 +88,7 @@ public:
- void(T::*fp)(const sensor_msgs::ImageConstPtr&), T* obj,
- const TransportHints& transport_hints = TransportHints())
- {
-- return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj, _1), ros::VoidPtr(), transport_hints);
-+ return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj, boost::placeholders::_1), ros::VoidPtr(), transport_hints);
- }
-
- /**
-@@ -100,7 +100,7 @@ public:
- const boost::shared_ptr<T>& obj,
- const TransportHints& transport_hints = TransportHints())
- {
-- return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj.get(), _1), obj, transport_hints);
-+ return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj.get(), boost::placeholders::_1), obj, transport_hints);
- }
-
- /**
-diff --git a/image_transport/src/camera_subscriber.cpp b/image_transport/src/camera_subscriber.cpp
-index a91a14e..fde728f 100644
---- a/image_transport/src/camera_subscriber.cpp
-+++ b/image_transport/src/camera_subscriber.cpp
-@@ -111,7 +111,7 @@ CameraSubscriber::CameraSubscriber(ImageTransport& image_it, ros::NodeHandle& in
- impl_->info_sub_ .subscribe(info_nh, info_topic, queue_size, transport_hints.getRosHints());
- impl_->sync_.connectInput(impl_->image_sub_, impl_->info_sub_);
- // need for Boost.Bind here is kind of broken
-- impl_->sync_.registerCallback(boost::bind(callback, _1, _2));
-+ impl_->sync_.registerCallback(boost::bind(callback, boost::placeholders::_1, boost::placeholders::_2));
-
- // Complain every 10s if it appears that the image and info topics are not synchronized
- impl_->image_sub_.registerCallback(boost::bind(increment, &impl_->image_received_));
-diff --git a/image_transport/src/publisher.cpp b/image_transport/src/publisher.cpp
-index ebf44bd..88d2648 100644
---- a/image_transport/src/publisher.cpp
-+++ b/image_transport/src/publisher.cpp
-@@ -208,7 +208,7 @@ SubscriberStatusCallback Publisher::rebindCB(const SubscriberStatusCallback& use
- if (user_cb)
- {
- ImplWPtr impl_wptr(impl_);
-- return boost::bind(&Publisher::weakSubscriberCb, impl_wptr, _1, user_cb);
-+ return boost::bind(&Publisher::weakSubscriberCb, impl_wptr, boost::placeholders::_1, user_cb);
- }
- else
- return SubscriberStatusCallback();
-diff --git a/image_transport/src/republish.cpp b/image_transport/src/republish.cpp
-index 14fb276..72d06ca 100644
---- a/image_transport/src/republish.cpp
-+++ b/image_transport/src/republish.cpp
-@@ -58,7 +58,7 @@ int main(int argc, char** argv)
- // Use Publisher::publish as the subscriber callback
- typedef void (image_transport::Publisher::*PublishMemFn)(const sensor_msgs::ImageConstPtr&) const;
- PublishMemFn pub_mem_fn = &image_transport::Publisher::publish;
-- sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, &pub, _1), ros::VoidPtr(), in_transport);
-+ sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, &pub, boost::placeholders::_1), ros::VoidPtr(), in_transport);
-
- ros::spin();
- }
-@@ -77,7 +77,7 @@ int main(int argc, char** argv)
- // Use PublisherPlugin::publish as the subscriber callback
- typedef void (Plugin::*PublishMemFn)(const sensor_msgs::ImageConstPtr&) const;
- PublishMemFn pub_mem_fn = &Plugin::publish;
-- sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, pub.get(), _1), pub, in_transport);
-+ sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, pub.get(), boost::placeholders::_1), pub, in_transport);
-
- ros::spin();
- }
-diff --git a/polled_camera/include/polled_camera/publication_server.h b/polled_camera/include/polled_camera/publication_server.h
-index 4bc3619..ebd0888 100644
---- a/polled_camera/include/polled_camera/publication_server.h
-+++ b/polled_camera/include/polled_camera/publication_server.h
-@@ -129,7 +129,7 @@ PublicationServer advertise(ros::NodeHandle& nh, const std::string& service,
- sensor_msgs::Image&, sensor_msgs::CameraInfo&),
- T* obj)
- {
-- return advertise(nh, service, boost::bind(fp, obj, _1, _2, _3, _4));
-+ return advertise(nh, service, boost::bind(fp, obj, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4));
- }
-
- /**
-@@ -142,7 +142,7 @@ PublicationServer advertise(ros::NodeHandle& nh, const std::string& service,
- sensor_msgs::Image&, sensor_msgs::CameraInfo&),
- const boost::shared_ptr<T>& obj)
- {
-- return advertise(nh, service, boost::bind(fp, obj.get(), _1, _2, _3, _4), obj);
-+ return advertise(nh, service, boost::bind(fp, obj.get(), boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4), obj);
- }
-
- } //namespace polled_camera
-diff --git a/polled_camera/src/publication_server.cpp b/polled_camera/src/publication_server.cpp
-index 99097ea..77f0265 100644
---- a/polled_camera/src/publication_server.cpp
-+++ b/polled_camera/src/publication_server.cpp
-@@ -86,7 +86,7 @@ public:
- if (!pub) {
- // Create a latching camera publisher.
- pub = it_.advertiseCamera(image_topic, 1, image_transport::SubscriberStatusCallback(),
-- boost::bind(&Impl::disconnectCallback, this, _1),
-+ boost::bind(&Impl::disconnectCallback, this, boost::placeholders::_1),
- ros::SubscriberStatusCallback(), ros::SubscriberStatusCallback(),
- ros::VoidPtr(), true /*latch*/);
- ROS_INFO("Advertising %s", pub.getTopic().c_str());
diff --git a/debian/patches/0005-Switch-to-hpp-headers-of-pluginlib.patch b/debian/patches/0005-Switch-to-hpp-headers-of-pluginlib.patch
deleted file mode 100644
index 14da42b..0000000
--- a/debian/patches/0005-Switch-to-hpp-headers-of-pluginlib.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Sat, 28 May 2022 21:37:59 +0200
-Subject: Switch to hpp headers of pluginlib
-
----
- image_transport/src/image_transport.cpp | 2 +-
- image_transport/src/list_transports.cpp | 2 +-
- image_transport/src/manifest.cpp | 2 +-
- image_transport/src/publisher.cpp | 2 +-
- image_transport/src/republish.cpp | 2 +-
- image_transport/src/subscriber.cpp | 2 +-
- image_transport/tutorial/src/manifest.cpp | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/image_transport/src/image_transport.cpp b/image_transport/src/image_transport.cpp
-index 88ba125..9ce6927 100644
---- a/image_transport/src/image_transport.cpp
-+++ b/image_transport/src/image_transport.cpp
-@@ -35,7 +35,7 @@
- #include "image_transport/image_transport.h"
- #include "image_transport/publisher_plugin.h"
- #include "image_transport/subscriber_plugin.h"
--#include <pluginlib/class_loader.h>
-+#include <pluginlib/class_loader.hpp>
- #include <boost/make_shared.hpp>
- #include <boost/foreach.hpp>
- #include <boost/algorithm/string/erase.hpp>
-diff --git a/image_transport/src/list_transports.cpp b/image_transport/src/list_transports.cpp
-index dba8812..91f5372 100644
---- a/image_transport/src/list_transports.cpp
-+++ b/image_transport/src/list_transports.cpp
-@@ -34,7 +34,7 @@
-
- #include "image_transport/publisher_plugin.h"
- #include "image_transport/subscriber_plugin.h"
--#include <pluginlib/class_loader.h>
-+#include <pluginlib/class_loader.hpp>
- #include <boost/foreach.hpp>
- #include <boost/algorithm/string/erase.hpp>
- #include <map>
-diff --git a/image_transport/src/manifest.cpp b/image_transport/src/manifest.cpp
-index 40a8acd..2656744 100644
---- a/image_transport/src/manifest.cpp
-+++ b/image_transport/src/manifest.cpp
-@@ -32,7 +32,7 @@
- * POSSIBILITY OF SUCH DAMAGE.
- *********************************************************************/
-
--#include <pluginlib/class_list_macros.h>
-+#include <pluginlib/class_list_macros.hpp>
- #include "image_transport/raw_publisher.h"
- #include "image_transport/raw_subscriber.h"
-
-diff --git a/image_transport/src/publisher.cpp b/image_transport/src/publisher.cpp
-index 88d2648..b41b95d 100644
---- a/image_transport/src/publisher.cpp
-+++ b/image_transport/src/publisher.cpp
-@@ -34,7 +34,7 @@
-
- #include "image_transport/publisher.h"
- #include "image_transport/publisher_plugin.h"
--#include <pluginlib/class_loader.h>
-+#include <pluginlib/class_loader.hpp>
- #include <boost/foreach.hpp>
- #include <boost/algorithm/string/erase.hpp>
-
-diff --git a/image_transport/src/republish.cpp b/image_transport/src/republish.cpp
-index 72d06ca..9094674 100644
---- a/image_transport/src/republish.cpp
-+++ b/image_transport/src/republish.cpp
-@@ -34,7 +34,7 @@
-
- #include "image_transport/image_transport.h"
- #include "image_transport/publisher_plugin.h"
--#include <pluginlib/class_loader.h>
-+#include <pluginlib/class_loader.hpp>
-
- int main(int argc, char** argv)
- {
-diff --git a/image_transport/src/subscriber.cpp b/image_transport/src/subscriber.cpp
-index b7ef654..e454a49 100644
---- a/image_transport/src/subscriber.cpp
-+++ b/image_transport/src/subscriber.cpp
-@@ -35,7 +35,7 @@
- #include "image_transport/subscriber.h"
- #include "image_transport/subscriber_plugin.h"
- #include <ros/names.h>
--#include <pluginlib/class_loader.h>
-+#include <pluginlib/class_loader.hpp>
- #include <boost/scoped_ptr.hpp>
-
- namespace image_transport {
-diff --git a/image_transport/tutorial/src/manifest.cpp b/image_transport/tutorial/src/manifest.cpp
-index ab20819..000800b 100644
---- a/image_transport/tutorial/src/manifest.cpp
-+++ b/image_transport/tutorial/src/manifest.cpp
-@@ -1,4 +1,4 @@
--#include <pluginlib/class_list_macros.h>
-+#include <pluginlib/class_list_macros.hpp>
- #include <image_transport_tutorial/resized_publisher.h>
- #include <image_transport_tutorial/resized_subscriber.h>
-
diff --git a/debian/patches/0006-Fix-plugin-path-for-new-pluginlib.patch b/debian/patches/0006-Fix-plugin-path-for-new-pluginlib.patch
index 28a5c43..1d7f606 100644
--- a/debian/patches/0006-Fix-plugin-path-for-new-pluginlib.patch
+++ b/debian/patches/0006-Fix-plugin-path-for-new-pluginlib.patch
@@ -7,20 +7,20 @@ Subject: Fix plugin path for new pluginlib
image_transport/tutorial/resized_plugins.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/image_transport/default_plugins.xml b/image_transport/default_plugins.xml
-index f3500ec..3714007 100644
---- a/image_transport/default_plugins.xml
-+++ b/image_transport/default_plugins.xml
+Index: ros-image-common.git/image_transport/default_plugins.xml
+===================================================================
+--- ros-image-common.git.orig/image_transport/default_plugins.xml
++++ ros-image-common.git/image_transport/default_plugins.xml
@@ -1,4 +1,4 @@
-<library path="lib/libimage_transport_plugins">
+<library path="libimage_transport_plugins">
<class name="image_transport/raw_pub" type="image_transport::RawPublisher" base_class_type="image_transport::PublisherPlugin">
<description>
This is the default publisher. It publishes the Image as-is on the base topic.
-diff --git a/image_transport/tutorial/resized_plugins.xml b/image_transport/tutorial/resized_plugins.xml
-index bd2dff1..12d066d 100644
---- a/image_transport/tutorial/resized_plugins.xml
-+++ b/image_transport/tutorial/resized_plugins.xml
+Index: ros-image-common.git/image_transport/tutorial/resized_plugins.xml
+===================================================================
+--- ros-image-common.git.orig/image_transport/tutorial/resized_plugins.xml
++++ ros-image-common.git/image_transport/tutorial/resized_plugins.xml
@@ -1,4 +1,4 @@
-<library path="lib/libresized_image_transport">
+<library path="libresized_image_transport">
diff --git a/debian/patches/series b/debian/patches/series
index 82df86d..c4c9911 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
0001-Add-CMakeLists.txt.patch
0002-Add-Debian-specific-SOVERSION.patch
0003-Make-Python-version-variable-for-pybuild.patch
-0004-Switch-to-new-boost-bind-bind.hpp.patch
-0005-Switch-to-hpp-headers-of-pluginlib.patch
0006-Fix-plugin-path-for-new-pluginlib.patch
diff --git a/image_transport/CMakeLists.txt b/image_transport/CMakeLists.txt
index 578205b..d52e04a 100644
--- a/image_transport/CMakeLists.txt
+++ b/image_transport/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(catkin REQUIRED
sensor_msgs
)
-find_package(Boost REQUIRED)
+find_package(Boost REQUIRED COMPONENTS filesystem)
catkin_package(
INCLUDE_DIRS include
diff --git a/image_transport/include/image_transport/image_transport.h b/image_transport/include/image_transport/image_transport.h
index 9a542e6..e20e1f8 100644
--- a/image_transport/include/image_transport/image_transport.h
+++ b/image_transport/include/image_transport/image_transport.h
@@ -97,7 +97,7 @@ public:
void(T::*fp)(const sensor_msgs::ImageConstPtr&), T* obj,
const TransportHints& transport_hints = TransportHints())
{
- return subscribe(base_topic, queue_size, boost::bind(fp, obj, _1), ros::VoidPtr(), transport_hints);
+ return subscribe(base_topic, queue_size, boost::bind(fp, obj, boost::placeholders::_1), ros::VoidPtr(), transport_hints);
}
/**
@@ -109,7 +109,7 @@ public:
const boost::shared_ptr<T>& obj,
const TransportHints& transport_hints = TransportHints())
{
- return subscribe(base_topic, queue_size, boost::bind(fp, obj.get(), _1), obj, transport_hints);
+ return subscribe(base_topic, queue_size, boost::bind(fp, obj.get(), boost::placeholders::_1), obj, transport_hints);
}
/*!
@@ -162,7 +162,7 @@ public:
const sensor_msgs::CameraInfoConstPtr&), T* obj,
const TransportHints& transport_hints = TransportHints())
{
- return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj, _1, _2), ros::VoidPtr(),
+ return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj, boost::placeholders::_1, boost::placeholders::_2), ros::VoidPtr(),
transport_hints);
}
@@ -177,7 +177,7 @@ public:
const boost::shared_ptr<T>& obj,
const TransportHints& transport_hints = TransportHints())
{
- return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj.get(), _1, _2), obj,
+ return subscribeCamera(base_topic, queue_size, boost::bind(fp, obj.get(), boost::placeholders::_1, boost::placeholders::_2), obj,
transport_hints);
}
diff --git a/image_transport/include/image_transport/simple_publisher_plugin.h b/image_transport/include/image_transport/simple_publisher_plugin.h
index 691d2ed..352c58b 100644
--- a/image_transport/include/image_transport/simple_publisher_plugin.h
+++ b/image_transport/include/image_transport/simple_publisher_plugin.h
@@ -185,9 +185,9 @@ private:
ros::SubscriberStatusCallback bindCB(const SubscriberStatusCallback& user_cb,
SubscriberStatusMemFn internal_cb_fn)
{
- ros::SubscriberStatusCallback internal_cb = boost::bind(internal_cb_fn, this, _1);
+ ros::SubscriberStatusCallback internal_cb = boost::bind(internal_cb_fn, this, boost::placeholders::_1);
if (user_cb)
- return boost::bind(&SimplePublisherPlugin::subscriberCB, this, _1, user_cb, internal_cb);
+ return boost::bind(&SimplePublisherPlugin::subscriberCB, this, boost::placeholders::_1, user_cb, internal_cb);
else
return internal_cb;
}
@@ -209,7 +209,7 @@ private:
// messages of the transport-specific type.
typedef void (SimplePublisherPlugin::*PublishMemFn)(const sensor_msgs::Image&, const PublishFn&) const;
PublishMemFn pub_mem_fn = &SimplePublisherPlugin::publish;
- ImagePublishFn image_publish_fn = boost::bind(pub_mem_fn, this, _1, bindInternalPublisher(ros_ssp));
+ ImagePublishFn image_publish_fn = boost::bind(pub_mem_fn, this, boost::placeholders::_1, bindInternalPublisher(ros_ssp));
SingleSubscriberPublisher ssp(ros_ssp.getSubscriberName(), getTopic(),
boost::bind(&SimplePublisherPlugin::getNumSubscribers, this),
@@ -231,7 +231,7 @@ private:
// Bind PubT::publish(const Message&) as PublishFn
typedef void (PubT::*InternalPublishMemFn)(const M&) const;
InternalPublishMemFn internal_pub_mem_fn = &PubT::publish;
- return boost::bind(internal_pub_mem_fn, &pub, _1);
+ return boost::bind(internal_pub_mem_fn, &pub, boost::placeholders::_1);
}
};
diff --git a/image_transport/include/image_transport/simple_subscriber_plugin.h b/image_transport/include/image_transport/simple_subscriber_plugin.h
index dd6ea3c..b0400ad 100644
--- a/image_transport/include/image_transport/simple_subscriber_plugin.h
+++ b/image_transport/include/image_transport/simple_subscriber_plugin.h
@@ -109,7 +109,7 @@ protected:
simple_impl_.reset(new SimpleSubscriberPluginImpl(param_nh));
simple_impl_->sub_ = nh.subscribe<M>(getTopicToSubscribe(base_topic), queue_size,
- boost::bind(&SimpleSubscriberPlugin::internalCallback, this, _1, callback),
+ boost::bind(&SimpleSubscriberPlugin::internalCallback, this, boost::placeholders::_1, callback),
tracked_object, transport_hints.getRosHints());
}
diff --git a/image_transport/include/image_transport/subscriber_filter.h b/image_transport/include/image_transport/subscriber_filter.h
index 3d5be7b..356a729 100644
--- a/image_transport/include/image_transport/subscriber_filter.h
+++ b/image_transport/include/image_transport/subscriber_filter.h
@@ -107,7 +107,7 @@ public:
{
unsubscribe();
- sub_ = it.subscribe(base_topic, queue_size, boost::bind(&SubscriberFilter::cb, this, _1),
+ sub_ = it.subscribe(base_topic, queue_size, boost::bind(&SubscriberFilter::cb, this, boost::placeholders::_1),
ros::VoidPtr(), transport_hints);
}
diff --git a/image_transport/include/image_transport/subscriber_plugin.h b/image_transport/include/image_transport/subscriber_plugin.h
index 4601dc9..97bc58b 100644
--- a/image_transport/include/image_transport/subscriber_plugin.h
+++ b/image_transport/include/image_transport/subscriber_plugin.h
@@ -88,7 +88,7 @@ public:
void(T::*fp)(const sensor_msgs::ImageConstPtr&), T* obj,
const TransportHints& transport_hints = TransportHints())
{
- return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj, _1), ros::VoidPtr(), transport_hints);
+ return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj, boost::placeholders::_1), ros::VoidPtr(), transport_hints);
}
/**
@@ -100,7 +100,7 @@ public:
const boost::shared_ptr<T>& obj,
const TransportHints& transport_hints = TransportHints())
{
- return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj.get(), _1), obj, transport_hints);
+ return subscribe(nh, base_topic, queue_size, boost::bind(fp, obj.get(), boost::placeholders::_1), obj, transport_hints);
}
/**
diff --git a/image_transport/src/camera_subscriber.cpp b/image_transport/src/camera_subscriber.cpp
index a91a14e..fde728f 100644
--- a/image_transport/src/camera_subscriber.cpp
+++ b/image_transport/src/camera_subscriber.cpp
@@ -111,7 +111,7 @@ CameraSubscriber::CameraSubscriber(ImageTransport& image_it, ros::NodeHandle& in
impl_->info_sub_ .subscribe(info_nh, info_topic, queue_size, transport_hints.getRosHints());
impl_->sync_.connectInput(impl_->image_sub_, impl_->info_sub_);
// need for Boost.Bind here is kind of broken
- impl_->sync_.registerCallback(boost::bind(callback, _1, _2));
+ impl_->sync_.registerCallback(boost::bind(callback, boost::placeholders::_1, boost::placeholders::_2));
// Complain every 10s if it appears that the image and info topics are not synchronized
impl_->image_sub_.registerCallback(boost::bind(increment, &impl_->image_received_));
diff --git a/image_transport/src/image_transport.cpp b/image_transport/src/image_transport.cpp
index 88ba125..9ce6927 100644
--- a/image_transport/src/image_transport.cpp
+++ b/image_transport/src/image_transport.cpp
@@ -35,7 +35,7 @@
#include "image_transport/image_transport.h"
#include "image_transport/publisher_plugin.h"
#include "image_transport/subscriber_plugin.h"
-#include <pluginlib/class_loader.h>
+#include <pluginlib/class_loader.hpp>
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/erase.hpp>
diff --git a/image_transport/src/list_transports.cpp b/image_transport/src/list_transports.cpp
index dba8812..91f5372 100644
--- a/image_transport/src/list_transports.cpp
+++ b/image_transport/src/list_transports.cpp
@@ -34,7 +34,7 @@
#include "image_transport/publisher_plugin.h"
#include "image_transport/subscriber_plugin.h"
-#include <pluginlib/class_loader.h>
+#include <pluginlib/class_loader.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/erase.hpp>
#include <map>
diff --git a/image_transport/src/manifest.cpp b/image_transport/src/manifest.cpp
index 40a8acd..2656744 100644
--- a/image_transport/src/manifest.cpp
+++ b/image_transport/src/manifest.cpp
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
#include "image_transport/raw_publisher.h"
#include "image_transport/raw_subscriber.h"
diff --git a/image_transport/src/publisher.cpp b/image_transport/src/publisher.cpp
index ebf44bd..b41b95d 100644
--- a/image_transport/src/publisher.cpp
+++ b/image_transport/src/publisher.cpp
@@ -34,7 +34,7 @@
#include "image_transport/publisher.h"
#include "image_transport/publisher_plugin.h"
-#include <pluginlib/class_loader.h>
+#include <pluginlib/class_loader.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/erase.hpp>
@@ -208,7 +208,7 @@ SubscriberStatusCallback Publisher::rebindCB(const SubscriberStatusCallback& use
if (user_cb)
{
ImplWPtr impl_wptr(impl_);
- return boost::bind(&Publisher::weakSubscriberCb, impl_wptr, _1, user_cb);
+ return boost::bind(&Publisher::weakSubscriberCb, impl_wptr, boost::placeholders::_1, user_cb);
}
else
return SubscriberStatusCallback();
diff --git a/image_transport/src/republish.cpp b/image_transport/src/republish.cpp
index 14fb276..9094674 100644
--- a/image_transport/src/republish.cpp
+++ b/image_transport/src/republish.cpp
@@ -34,7 +34,7 @@
#include "image_transport/image_transport.h"
#include "image_transport/publisher_plugin.h"
-#include <pluginlib/class_loader.h>
+#include <pluginlib/class_loader.hpp>
int main(int argc, char** argv)
{
@@ -58,7 +58,7 @@ int main(int argc, char** argv)
// Use Publisher::publish as the subscriber callback
typedef void (image_transport::Publisher::*PublishMemFn)(const sensor_msgs::ImageConstPtr&) const;
PublishMemFn pub_mem_fn = &image_transport::Publisher::publish;
- sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, &pub, _1), ros::VoidPtr(), in_transport);
+ sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, &pub, boost::placeholders::_1), ros::VoidPtr(), in_transport);
ros::spin();
}
@@ -77,7 +77,7 @@ int main(int argc, char** argv)
// Use PublisherPlugin::publish as the subscriber callback
typedef void (Plugin::*PublishMemFn)(const sensor_msgs::ImageConstPtr&) const;
PublishMemFn pub_mem_fn = &Plugin::publish;
- sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, pub.get(), _1), pub, in_transport);
+ sub = it.subscribe(in_topic, 1, boost::bind(pub_mem_fn, pub.get(), boost::placeholders::_1), pub, in_transport);
ros::spin();
}
diff --git a/image_transport/src/subscriber.cpp b/image_transport/src/subscriber.cpp
index b7ef654..e454a49 100644
--- a/image_transport/src/subscriber.cpp
+++ b/image_transport/src/subscriber.cpp
@@ -35,7 +35,7 @@
#include "image_transport/subscriber.h"
#include "image_transport/subscriber_plugin.h"
#include <ros/names.h>
-#include <pluginlib/class_loader.h>
+#include <pluginlib/class_loader.hpp>
#include <boost/scoped_ptr.hpp>
namespace image_transport {
diff --git a/image_transport/tutorial/src/manifest.cpp b/image_transport/tutorial/src/manifest.cpp
index ab20819..000800b 100644
--- a/image_transport/tutorial/src/manifest.cpp
+++ b/image_transport/tutorial/src/manifest.cpp
@@ -1,4 +1,4 @@
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
#include <image_transport_tutorial/resized_publisher.h>
#include <image_transport_tutorial/resized_subscriber.h>
diff --git a/polled_camera/include/polled_camera/publication_server.h b/polled_camera/include/polled_camera/publication_server.h
index 4bc3619..ebd0888 100644
--- a/polled_camera/include/polled_camera/publication_server.h
+++ b/polled_camera/include/polled_camera/publication_server.h
@@ -129,7 +129,7 @@ PublicationServer advertise(ros::NodeHandle& nh, const std::string& service,
sensor_msgs::Image&, sensor_msgs::CameraInfo&),
T* obj)
{
- return advertise(nh, service, boost::bind(fp, obj, _1, _2, _3, _4));
+ return advertise(nh, service, boost::bind(fp, obj, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4));
}
/**
@@ -142,7 +142,7 @@ PublicationServer advertise(ros::NodeHandle& nh, const std::string& service,
sensor_msgs::Image&, sensor_msgs::CameraInfo&),
const boost::shared_ptr<T>& obj)
{
- return advertise(nh, service, boost::bind(fp, obj.get(), _1, _2, _3, _4), obj);
+ return advertise(nh, service, boost::bind(fp, obj.get(), boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4), obj);
}
} //namespace polled_camera
diff --git a/polled_camera/src/publication_server.cpp b/polled_camera/src/publication_server.cpp
index 99097ea..77f0265 100644
--- a/polled_camera/src/publication_server.cpp
+++ b/polled_camera/src/publication_server.cpp
@@ -86,7 +86,7 @@ public:
if (!pub) {
// Create a latching camera publisher.
pub = it_.advertiseCamera(image_topic, 1, image_transport::SubscriberStatusCallback(),
- boost::bind(&Impl::disconnectCallback, this, _1),
+ boost::bind(&Impl::disconnectCallback, this, boost::placeholders::_1),
ros::SubscriberStatusCallback(), ros::SubscriberStatusCallback(),
ros::VoidPtr(), true /*latch*/);
ROS_INFO("Advertising %s", pub.getTopic().c_str());
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/1b/6222aa0297036d112912b6be591ef1380eb093.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/83/56d7af0fc331425ed6f58e88616b68ab3f4d07.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/83/cb631ade3fa3a89b3de2f0eec3b09199e2c64f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/94/3815db645853ab55a4e1a512fe1748efa63065.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/a4/efb60aaeee62dd89657fe34c753ec55ad8101d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/a8/8e1d4fbf3ace813a781436ca0c71d138f27ecb.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/aa/73ce80b01fbb672a79b7f9c8a8a48cc4b178c9.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/bf/1783fd4433e85f85e2fa68ccd9ca098fecc578.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/d0/5ab02a517e03ca292d1920429bcbd1134295f8.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/f2/5f984f2bf9331259ecf13d7765bad2818b6518.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/12/4d7cbeca365197fdea4d6f354453d40b52bd5d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/1d/906fd6ad450316ad53975fdfbaf8d700efbf83.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/25/89d7f8c115ce87e871fd63603d77af1543e7a4.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/63/7383adcaf4f8b495f220661eda88b7a8e10ac8.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/7c/45a53eefbf319f635291498551a10cd73c93e1.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/89/f078ee48dbc70e178c74b638e1ddd7eb8202e4.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/8e/702b3a538e538d8727cfe05080b665c39a96f8.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/cb/8555c53337b82bb8c5e6ab09c80fadb94a91ee.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/f0/9327683d9abfd0fa7ebc2d348163a1931e86ab.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/f6/c82e87a3e0897c5058d4ac868c34e600d02d53.debug
Control files of package camera-calibration-parsers-tools: lines which differ (wdiff format)
Depends: libc6 (>= 2.34), libcamera-calibration-parsers0d (>= 1.12.0), 1.12.0+git20220621.1.cd57529), libgcc-s1 (>= 3.0), librosconsole3d (>= 1.14.3), libstdc++6 (>= 5.2)
Control files of package camera-calibration-parsers-tools-dbgsym: lines which differ (wdiff format)
Build-Ids: 8e702b3a538e538d8727cfe05080b665c39a96f8 1b6222aa0297036d112912b6be591ef1380eb093
No differences were encountered between the control files of package cl-polled-camera
Control files of package image-transport-tools: lines which differ (wdiff format)
Depends: libament-index-cpp0d (>= 1.5.1), libc6 (>= 2.34), libclass-loader3d (>= 2.4.0), libconsole-bridge1.0 (>= 1.0.1+dfsg2), 1.0.2), libgcc-s1 (>= 3.0), libimage-transport0d (>= 1.12.0), 1.12.0+git20220621.1.cd57529), librcpputils1d (>= 2.6.0), librcutils1d (>= 6.0.0), libroscpp4d (>= 1.15.15+ds), libroslib0d (>= 1.15.8), libstdc++6 (>= 11), libtinyxml2-9 (>= 8.0.0)
Control files of package image-transport-tools-dbgsym: lines which differ (wdiff format)
Build-Ids: cb8555c53337b82bb8c5e6ab09c80fadb94a91ee f09327683d9abfd0fa7ebc2d348163a1931e86ab 8356d7af0fc331425ed6f58e88616b68ab3f4d07 aa73ce80b01fbb672a79b7f9c8a8a48cc4b178c9
No differences were encountered between the control files of package libcamera-calibration-parsers-dev
No differences were encountered between the control files of package libcamera-calibration-parsers0d
Control files of package libcamera-calibration-parsers0d-dbgsym: lines which differ (wdiff format)
Build-Ids: 2589d7f8c115ce87e871fd63603d77af1543e7a4 bf1783fd4433e85f85e2fa68ccd9ca098fecc578
No differences were encountered between the control files of package libcamera-info-manager-dev
Control files of package libcamera-info-manager0d: lines which differ (wdiff format)
Depends: libc6 (>= 2.33), libcamera-calibration-parsers0d (>= 1.12.0), 1.12.0+git20220621.1.cd57529), libgcc-s1 (>= 3.0), librosconsole3d (>= 1.14.3), libroscpp-serialization0d (>= 0.7.2), libroscpp4d (>= 1.15.15+ds), libroslib0d (>= 1.15.8), libstdc++6 (>= 11)
Control files of package libcamera-info-manager0d-dbgsym: lines which differ (wdiff format)
Build-Ids: 89f078ee48dbc70e178c74b638e1ddd7eb8202e4 943815db645853ab55a4e1a512fe1748efa63065
No differences were encountered between the control files of package libimage-transport-dev
Control files of package libimage-transport0d: lines which differ (wdiff format)
Depends: libament-index-cpp0d (>= 1.5.1), libc6 (>= 2.32), libclass-loader3d (>= 2.4.0), libconsole-bridge1.0 (>= 1.0.1+dfsg2), 1.0.2), libgcc-s1 (>= 3.0), libmessage-filters1d (>= 1.15.15+ds), librcpputils1d (>= 2.6.0), librcutils1d (>= 6.0.0), librosconsole3d (>= 1.14.3), libroscpp-serialization0d (>= 0.7.2), libroscpp4d (>= 1.15.15+ds), libroslib0d (>= 1.15.8), librostime1d (>= 0.7.2), libstdc++6 (>= 11), libtinyxml2-9 (>= 8.0.0)
Control files of package libimage-transport0d-dbgsym: lines which differ (wdiff format)
Build-Ids: 124d7cbeca365197fdea4d6f354453d40b52bd5d 7c45a53eefbf319f635291498551a10cd73c93e1 83cb631ade3fa3a89b3de2f0eec3b09199e2c64f a88e1d4fbf3ace813a781436ca0c71d138f27ecb
No differences were encountered between the control files of package libpolled-camera-dev
Control files of package libpolled-camera0d: lines which differ (wdiff format)
Depends: libc6 (>= 2.14), libgcc-s1 (>= 3.0), libimage-transport0d (>= 1.12.0), 1.12.0+git20220621.1.cd57529), librosconsole3d (>= 1.14.3), libroscpp-serialization0d (>= 0.7.2), libroscpp4d (>= 1.15.15+ds), librostime1d (>= 0.7.2), libstdc++6 (>= 5.2)
Control files of package libpolled-camera0d-dbgsym: lines which differ (wdiff format)
Build-Ids: 1d906fd6ad450316ad53975fdfbaf8d700efbf83 a4efb60aaeee62dd89657fe34c753ec55ad8101d
No differences were encountered between the control files of package polled-camera-tool
Control files of package polled-camera-tool-dbgsym: lines which differ (wdiff format)
Build-Ids: f6c82e87a3e0897c5058d4ac868c34e600d02d53 f25f984f2bf9331259ecf13d7765bad2818b6518
Control files of package python3-camera-calibration-parsers: lines which differ (wdiff format)
Depends: python3 (<< 3.11), python3 (>= 3.10~), python3:any, libboost-python1.74.0 (>= 1.74.0), libboost-python1.74.0-py310, libc6 (>= 2.14), libcamera-calibration-parsers0d (>= 1.12.0), 1.12.0+git20220621.1.cd57529), libgcc-s1 (>= 3.0), libpython3.10 (>= 3.10.0), libroscpp-serialization0d (>= 0.7.2), libstdc++6 (>= 5.2), python3-sensor-msgs
Control files of package python3-camera-calibration-parsers-dbgsym: lines which differ (wdiff format)
Build-Ids: 637383adcaf4f8b495f220661eda88b7a8e10ac8 d05ab02a517e03ca292d1920429bcbd1134295f8
No differences were encountered between the control files of package python3-polled-camera