replace streaming operator with function to avoid conflicting definition

christianrauch · Dec 31, 2024 · ee98bdf · ee98bdf
1 parent 5ca1a08
commit ee98bdf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/CameraNode.cpp b/src/CameraNode.cpp
@@ -331,7 +331,7 @@ CameraNode::CameraNode(const rclcpp::NodeOptions &options) : Node("camera", opti
 
   const libcamera::Size size(get_parameter("width").as_int(), get_parameter("height").as_int());
   if (size.isNull()) {
-    RCLCPP_INFO_STREAM(get_logger(), scfg);
+    RCLCPP_INFO_STREAM(get_logger(), list_format_sizes(scfg));
     RCLCPP_WARN_STREAM(get_logger(),
                        "no dimensions selected, auto-selecting: \"" << scfg.size << "\"");
     RCLCPP_WARN_STREAM(get_logger(), "set parameter 'width' or 'height' to silence this warning");
@@ -350,7 +350,7 @@ CameraNode::CameraNode(const rclcpp::NodeOptions &options) : Node("camera", opti
     if (selected_scfg.pixelFormat != scfg.pixelFormat)
       RCLCPP_INFO_STREAM(get_logger(), stream_formats);
     if (selected_scfg.size != scfg.size)
-      RCLCPP_INFO_STREAM(get_logger(), scfg);
+      RCLCPP_INFO_STREAM(get_logger(), list_format_sizes(scfg));
     RCLCPP_WARN_STREAM(get_logger(), "stream configuration adjusted from \""
                                        << selected_scfg.toString() << "\" to \"" << scfg.toString()
                                        << "\"");

diff --git a/src/pretty_print.cpp b/src/pretty_print.cpp
@@ -9,6 +9,7 @@
 #include <libcamera/stream.h>
 #include <memory>
 #include <optional>
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -43,13 +44,14 @@ operator<<(std::ostream &out, const libcamera::StreamFormats &formats)
   return out;
 }
 
-std::ostream &
-operator<<(std::ostream &out, const libcamera::StreamConfiguration &configuration)
+std::string
+list_format_sizes(const libcamera::StreamConfiguration &configuration)
 {
+  std::ostringstream out;
   out << std::endl
       << ">> " << configuration.pixelFormat << " format sizes:";
   for (const libcamera::Size &size : configuration.formats().sizes(configuration.pixelFormat))
     out << std::endl
         << "   - " << size.toString();
-  return out;
+  return out.str();
 }
diff --git a/src/pretty_print.hpp b/src/pretty_print.hpp
@@ -15,5 +15,5 @@ operator<<(std::ostream &out, const libcamera::CameraManager &camera_manager);
 std::ostream &
 operator<<(std::ostream &out, const libcamera::StreamFormats &formats);
 
-std::ostream &
-operator<<(std::ostream &out, const libcamera::StreamConfiguration &configuration);
+std::string
+list_format_sizes(const libcamera::StreamConfiguration &configuration);