Merge remote-tracking branch 'origin/patch-2' into patch-1

roncapat · roncapat · commit 1b8c3c997583 · 2025-07-28T14:50:34.000+02:00
diff --git a/compressed_depth_image_transport/CHANGELOG.rst b/compressed_depth_image_transport/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package compressed_depth_image_transport
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.1.0 (2025-07-15)
+------------------
+* Replace rmw_qos_profile_t with rclcpp::QoS (`#193 <https://github.com/ros-perception/image_transport_plugins/issues/193>`_)
+* Contributors: Alejandro Hernández Cordero
+
 6.0.0 (2025-07-09)
 ------------------
 * Use non deprecated method (`#182 <https://github.com/ros-perception/image_transport_plugins/issues/182>`_)
diff --git a/compressed_depth_image_transport/include/compressed_depth_image_transport/compressed_depth_publisher.hpp b/compressed_depth_image_transport/include/compressed_depth_image_transport/compressed_depth_publisher.hpp
@@ -65,7 +65,7 @@ class CompressedDepthPublisher : public image_transport::SimplePublisherPlugin<C
   void advertiseImpl(
     rclcpp::Node * node,
     const std::string & base_topic,
-    rmw_qos_profile_t custom_qos,
+    rclcpp::QoS custom_qos,
     rclcpp::PublisherOptions options) final;
 
   void publish(
diff --git a/compressed_depth_image_transport/package.xml b/compressed_depth_image_transport/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>compressed_depth_image_transport</name>
-  <version>6.0.0</version>
+  <version>6.1.0</version>
   <description>
     Compressed_depth_image_transport provides a plugin to image_transport for transparently sending
     depth images (raw, floating-point) using PNG compression.
diff --git a/compressed_depth_image_transport/src/compressed_depth_publisher.cpp b/compressed_depth_image_transport/src/compressed_depth_publisher.cpp
@@ -105,7 +105,7 @@ const struct ParameterDefinition kParameters[] =
 void CompressedDepthPublisher::advertiseImpl(
   rclcpp::Node * node,
   const std::string & base_topic,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::PublisherOptions options)
 {
   node_ = node;
diff --git a/compressed_image_transport/CHANGELOG.rst b/compressed_image_transport/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package compressed_image_transport
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.1.0 (2025-07-15)
+------------------
+* Replace rmw_qos_profile_t with rclcpp::QoS (`#193 <https://github.com/ros-perception/image_transport_plugins/issues/193>`_)
+* Contributors: Alejandro Hernández Cordero
+
 6.0.0 (2025-07-09)
 ------------------
 * Use non deprecated method (`#182 <https://github.com/ros-perception/image_transport_plugins/issues/182>`_)
diff --git a/compressed_image_transport/include/compressed_image_transport/compressed_publisher.hpp b/compressed_image_transport/include/compressed_image_transport/compressed_publisher.hpp
@@ -67,7 +67,7 @@ class CompressedPublisher : public image_transport::SimplePublisherPlugin<Compre
   void advertiseImpl(
     rclcpp::Node * node,
     const std::string & base_topic,
-    rmw_qos_profile_t custom_qos,
+    rclcpp::QoS custom_qos,
     rclcpp::PublisherOptions options) override;
 
   void publish(
diff --git a/compressed_image_transport/include/compressed_image_transport/compressed_subscriber.hpp b/compressed_image_transport/include/compressed_image_transport/compressed_subscriber.hpp
@@ -67,7 +67,7 @@ class CompressedSubscriber final : public image_transport::SimpleSubscriberPlugi
     rclcpp::Node *,
     const std::string & base_topic,
     const Callback & callback,
-    rmw_qos_profile_t custom_qos,
+    rclcpp::QoS custom_qos,
     rclcpp::SubscriptionOptions options) override;
 
   void internalCallback(
diff --git a/compressed_image_transport/package.xml b/compressed_image_transport/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>compressed_image_transport</name>
-  <version>6.0.0</version>
+  <version>6.1.0</version>
   <description>
     Compressed_image_transport provides a plugin to image_transport for transparently sending images
     encoded as JPEG or PNG.
diff --git a/compressed_image_transport/src/compressed_publisher.cpp b/compressed_image_transport/src/compressed_publisher.cpp
@@ -133,7 +133,7 @@ const struct ParameterDefinition kParameters[] =
 void CompressedPublisher::advertiseImpl(
   rclcpp::Node * node,
   const std::string & base_topic,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::PublisherOptions options)
 {
   node_ = node;
diff --git a/compressed_image_transport/src/compressed_subscriber.cpp b/compressed_image_transport/src/compressed_subscriber.cpp
@@ -71,7 +71,7 @@ void CompressedSubscriber::subscribeImpl(
   rclcpp::Node * node,
   const std::string & base_topic,
   const Callback & callback,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::SubscriptionOptions options)
 {
   node_ = node;
diff --git a/image_transport_plugins/CHANGELOG.rst b/image_transport_plugins/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package image_transport_plugins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.1.0 (2025-07-15)
+------------------
+
 6.0.0 (2025-07-09)
 ------------------
 
diff --git a/image_transport_plugins/package.xml b/image_transport_plugins/package.xml
@@ -4,7 +4,7 @@
   <!-- TODO: Make this a metapackage, see
        https://github.com/ros2/ros2/issues/408 -->
   <name>image_transport_plugins</name>
-  <version>6.0.0</version>
+  <version>6.1.0</version>
     <description>
     A set of plugins for publishing and subscribing to sensor_msgs/Image topics
     in representations other than raw pixel data. For example, for viewing a
diff --git a/theora_image_transport/CHANGELOG.rst b/theora_image_transport/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package theora_image_transport
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.1.0 (2025-07-15)
+------------------
+* Replace rmw_qos_profile_t with rclcpp::QoS (`#193 <https://github.com/ros-perception/image_transport_plugins/issues/193>`_)
+* Contributors: Alejandro Hernández Cordero
+
 6.0.0 (2025-07-09)
 ------------------
 * Use non deprecated method (`#182 <https://github.com/ros-perception/image_transport_plugins/issues/182>`_)
diff --git a/theora_image_transport/include/theora_image_transport/theora_publisher.hpp b/theora_image_transport/include/theora_image_transport/theora_publisher.hpp
@@ -70,7 +70,7 @@ class TheoraPublisher
   void advertiseImpl(
     rclcpp::Node * node,
     const std::string & base_topic,
-    rmw_qos_profile_t custom_qos,
+    rclcpp::QoS custom_qos,
     rclcpp::PublisherOptions options) override;
 
   // TODO(anyone): Callback to send header packets to new clients
diff --git a/theora_image_transport/include/theora_image_transport/theora_subscriber.hpp b/theora_image_transport/include/theora_image_transport/theora_subscriber.hpp
@@ -64,7 +64,7 @@ class TheoraSubscriber
     rclcpp::Node * node,
     const std::string & base_topic,
     const Callback & callback,
-    rmw_qos_profile_t custom_qos,
+    rclcpp::QoS custom_qos,
     rclcpp::SubscriptionOptions options) override;
 
   // The function that does the actual decompression and calls a user supplied
diff --git a/theora_image_transport/package.xml b/theora_image_transport/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>theora_image_transport</name>
-  <version>6.0.0</version>
+  <version>6.1.0</version>
   <description>
     Theora_image_transport provides a plugin to image_transport for
     transparently sending an image stream encoded with the Theora codec.
diff --git a/theora_image_transport/src/theora_publisher.cpp b/theora_image_transport/src/theora_publisher.cpp
@@ -140,7 +140,7 @@ TheoraPublisher::~TheoraPublisher()
 void TheoraPublisher::advertiseImpl(
   rclcpp::Node *node,
   const std::string & base_topic,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::PublisherOptions options)
 {
   node_ = node;
diff --git a/theora_image_transport/src/theora_subscriber.cpp b/theora_image_transport/src/theora_subscriber.cpp
@@ -96,7 +96,7 @@ void TheoraSubscriber::subscribeImpl(
   rclcpp::Node * node,
   const std::string & base_topic,
   const Callback & callback,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::SubscriptionOptions options)
 {
   node_ = node;
diff --git a/zstd_image_transport/CHANGELOG.rst b/zstd_image_transport/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package zstd_image_transport
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+6.1.0 (2025-07-15)
+------------------
+* Replace rmw_qos_profile_t with rclcpp::QoS (`#193 <https://github.com/ros-perception/image_transport_plugins/issues/193>`_)
+* Contributors: Alejandro Hernández Cordero
+
 6.0.0 (2025-07-09)
 ------------------
 * Use non deprecated method (`#182 <https://github.com/ros-perception/image_transport_plugins/issues/182>`_)
diff --git a/zstd_image_transport/include/zstd_image_transport/zstd_publisher.hpp b/zstd_image_transport/include/zstd_image_transport/zstd_publisher.hpp
@@ -65,8 +65,8 @@ class ZstdPublisher : public image_transport::SimplePublisherPlugin<CompressedIm
   void advertiseImpl(
     rclcpp::Node * node,
     const std::string & base_topic,
-    rmw_qos_profile_t custom_qos,
-    rclcpp::PublisherOptions options) override;
+    rclcpp::QoS custom_qos,
+    rclcpp::PublisherOptions options) final;
 
   void publish(
     const sensor_msgs::msg::Image & message,
diff --git a/zstd_image_transport/include/zstd_image_transport/zstd_subscriber.hpp b/zstd_image_transport/include/zstd_image_transport/zstd_subscriber.hpp
@@ -65,7 +65,7 @@ class ZstdSubscriber final
     rclcpp::Node *,
     const std::string & base_topic,
     const Callback & callback,
-    rmw_qos_profile_t custom_qos,
+    rclcpp::QoS custom_qos,
     rclcpp::SubscriptionOptions options) override;
 
   void internalCallback(
diff --git a/zstd_image_transport/package.xml b/zstd_image_transport/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>zstd_image_transport</name>
-  <version>6.0.0</version>
+  <version>6.1.0</version>
   <description>
     zstd_image_transport provides a plugin to image_transport for transparently sending images
     encoded as zstd blobs
diff --git a/zstd_image_transport/src/zstd_publisher.cpp b/zstd_image_transport/src/zstd_publisher.cpp
@@ -75,7 +75,7 @@ std::string ZstdPublisher::getTransportName() const
 void ZstdPublisher::advertiseImpl(
   rclcpp::Node * node,
   const std::string & base_topic,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::PublisherOptions options)
 {
   node_ = node;
diff --git a/zstd_image_transport/src/zstd_subscriber.cpp b/zstd_image_transport/src/zstd_subscriber.cpp
@@ -61,7 +61,7 @@ void ZstdSubscriber::subscribeImpl(
   rclcpp::Node * node,
   const std::string & base_topic,
   const Callback & callback,
-  rmw_qos_profile_t custom_qos,
+  rclcpp::QoS custom_qos,
   rclcpp::SubscriptionOptions options)
 {
   node_ = node;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ const struct ParameterDefinition kParameters[] =`
`105`	`105`	`void CompressedDepthPublisher::advertiseImpl(`
`106`	`106`	`rclcpp::Node * node,`
`107`	`107`	`const std::string & base_topic,`
`108`		`- rmw_qos_profile_t custom_qos,`
	`108`	`+ rclcpp::QoS custom_qos,`
`109`	`109`	`rclcpp::PublisherOptions options)`
`110`	`110`	`{`
`111`	`111`	`node_ = node;`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ const struct ParameterDefinition kParameters[] =`
`133`	`133`	`void CompressedPublisher::advertiseImpl(`
`134`	`134`	`rclcpp::Node * node,`
`135`	`135`	`const std::string & base_topic,`
`136`		`- rmw_qos_profile_t custom_qos,`
	`136`	`+ rclcpp::QoS custom_qos,`
`137`	`137`	`rclcpp::PublisherOptions options)`
`138`	`138`	`{`
`139`	`139`	`node_ = node;`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ void CompressedSubscriber::subscribeImpl(`
`71`	`71`	`rclcpp::Node * node,`
`72`	`72`	`const std::string & base_topic,`
`73`	`73`	`const Callback & callback,`
`74`		`- rmw_qos_profile_t custom_qos,`
	`74`	`+ rclcpp::QoS custom_qos,`
`75`	`75`	`rclcpp::SubscriptionOptions options)`
`76`	`76`	`{`
`77`	`77`	`node_ = node;`