decodeImage -> decode_image

Author: bjsowa

include/web_video_server/image_transport_streamer.hpp

@@ -64,7 +64,7 @@ class ImageTransportStreamerBase : public StreamerInterface
   virtual void start();
 
 protected:
-  virtual cv::Mat decodeImage(const sensor_msgs::msg::Image::ConstSharedPtr & msg);
+  virtual cv::Mat decode_image(const sensor_msgs::msg::Image::ConstSharedPtr & msg);
   virtual void send_image(const cv::Mat &, const std::chrono::steady_clock::time_point & time) = 0;
   virtual void restream_frame(std::chrono::duration<double> max_age);
   virtual void initialize(const cv::Mat &);

include/web_video_server/streamers/png_streamers.hpp

@@ -60,7 +60,7 @@ class PngStreamer : public ImageTransportStreamerBase
 
 protected:
   virtual void send_image(const cv::Mat &, const std::chrono::steady_clock::time_point & time);
-  virtual cv::Mat decodeImage(const sensor_msgs::msg::Image::ConstSharedPtr & msg);
+  virtual cv::Mat decode_image(const sensor_msgs::msg::Image::ConstSharedPtr & msg);
 
 private:
   MultipartStream stream_;
@@ -87,7 +87,7 @@ class PngSnapshotStreamer : public ImageTransportStreamerBase
 
 protected:
   virtual void send_image(const cv::Mat &, const std::chrono::steady_clock::time_point & time);
-  virtual cv::Mat decodeImage(const sensor_msgs::msg::Image::ConstSharedPtr & msg);
+  virtual cv::Mat decode_image(const sensor_msgs::msg::Image::ConstSharedPtr & msg);
 
 private:
   int quality_;

src/image_transport_streamer.cpp

@@ -156,7 +156,7 @@ void ImageTransportStreamerBase::image_callback(const sensor_msgs::msg::Image::C
 
   cv::Mat img;
   try {
-    img = decodeImage(msg);
+    img = decode_image(msg);
     int input_width = img.cols;
     int input_height = img.rows;
 
@@ -218,7 +218,7 @@ void ImageTransportStreamerBase::image_callback(const sensor_msgs::msg::Image::C
   }
 }
 
-cv::Mat ImageTransportStreamerBase::decodeImage(
+cv::Mat ImageTransportStreamerBase::decode_image(
   const sensor_msgs::msg::Image::ConstSharedPtr & msg)
 {
   if (msg->encoding.find("F") != std::string::npos) {

src/streamers/png_streamers.cpp

@@ -78,14 +78,14 @@ PngStreamer::~PngStreamer()
   std::scoped_lock lock(send_mutex_);  // protects send_image.
 }
 
-cv::Mat PngStreamer::decodeImage(const sensor_msgs::msg::Image::ConstSharedPtr & msg)
+cv::Mat PngStreamer::decode_image(const sensor_msgs::msg::Image::ConstSharedPtr & msg)
 {
   // Handle alpha values since PNG supports it
   if (sensor_msgs::image_encodings::hasAlpha(msg->encoding)) {
     return cv_bridge::toCvCopy(msg, "bgra8")->image;
   } else {
     // Use the normal decode otherwise
-    return ImageTransportStreamerBase::decodeImage(msg);
+    return ImageTransportStreamerBase::decode_image(msg);
   }
 }
 
@@ -126,14 +126,14 @@ PngSnapshotStreamer::~PngSnapshotStreamer()
   std::scoped_lock lock(send_mutex_);  // protects send_image.
 }
 
-cv::Mat PngSnapshotStreamer::decodeImage(const sensor_msgs::msg::Image::ConstSharedPtr & msg)
+cv::Mat PngSnapshotStreamer::decode_image(const sensor_msgs::msg::Image::ConstSharedPtr & msg)
 {
   // Handle alpha values since PNG supports it
   if (sensor_msgs::image_encodings::hasAlpha(msg->encoding)) {
     return cv_bridge::toCvCopy(msg, "bgra8")->image;
   } else {
     // Use the normal decode otherwise
-    return ImageTransportStreamerBase::decodeImage(msg);
+    return ImageTransportStreamerBase::decode_image(msg);
   }
 }