From 66980a27308b3cc62bc3eaf27492a80520c4622a Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Mon, 22 Apr 2019 16:01:45 +0900 Subject: [PATCH] override is not supported gcc4.6 (12.04), remove this fix and add NOLINT --- src/nodelet/adding_images_nodelet.cpp | 8 ++--- src/nodelet/camshift_nodelet.cpp | 8 ++--- src/nodelet/color_filter_nodelet.cpp | 30 +++++++++---------- src/nodelet/contour_moments_nodelet.cpp | 8 ++--- src/nodelet/convex_hull_nodelet.cpp | 8 ++--- src/nodelet/corner_harris_nodelet.cpp | 8 ++--- .../discrete_fourier_transform_nodelet.cpp | 8 ++--- src/nodelet/edge_detection_nodelet.cpp | 8 ++--- src/nodelet/face_detection_nodelet.cpp | 8 ++--- src/nodelet/face_recognition_nodelet.cpp | 8 ++--- src/nodelet/fback_flow_nodelet.cpp | 8 ++--- src/nodelet/find_contours_nodelet.cpp | 8 ++--- src/nodelet/general_contours_nodelet.cpp | 8 ++--- src/nodelet/goodfeature_track_nodelet.cpp | 8 ++--- src/nodelet/hough_circles_nodelet.cpp | 8 ++--- src/nodelet/hough_lines_nodelet.cpp | 8 ++--- src/nodelet/lk_flow_nodelet.cpp | 8 ++--- src/nodelet/people_detect_nodelet.cpp | 8 ++--- src/nodelet/phase_corr_nodelet.cpp | 8 ++--- src/nodelet/pyramids_nodelet.cpp | 8 ++--- src/nodelet/segment_objects_nodelet.cpp | 8 ++--- .../simple_compressed_example_nodelet.cpp | 4 +-- src/nodelet/simple_example_nodelet.cpp | 4 +-- src/nodelet/simple_flow_nodelet.cpp | 8 ++--- src/nodelet/smoothing_nodelet.cpp | 8 ++--- src/nodelet/threshold_nodelet.cpp | 8 ++--- .../watershed_segmentation_nodelet.cpp | 8 ++--- 27 files changed, 115 insertions(+), 115 deletions(-) diff --git a/src/nodelet/adding_images_nodelet.cpp b/src/nodelet/adding_images_nodelet.cpp index 18d2e600..2e83b3e5 100644 --- a/src/nodelet/adding_images_nodelet.cpp +++ b/src/nodelet/adding_images_nodelet.cpp @@ -109,7 +109,7 @@ class AddingImagesNodelet : public opencv_apps::Nodelet doWork(msg1, msg2, msg1->header.frame_id); } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); sub_image1_.subscribe(*it_, "image1", 3); @@ -148,7 +148,7 @@ class AddingImagesNodelet : public opencv_apps::Nodelet } } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); sub_image1_.unsubscribe(); @@ -241,7 +241,7 @@ class AddingImagesNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -275,7 +275,7 @@ namespace adding_images class AddingImagesNodelet : public opencv_apps::AddingImagesNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet adding_images/adding_images is deprecated, " "and renamed to opencv_apps/adding_images."); diff --git a/src/nodelet/camshift_nodelet.cpp b/src/nodelet/camshift_nodelet.cpp index e3210c31..a16cfb62 100644 --- a/src/nodelet/camshift_nodelet.cpp +++ b/src/nodelet/camshift_nodelet.cpp @@ -338,7 +338,7 @@ class CamShiftNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -347,7 +347,7 @@ class CamShiftNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &CamShiftNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -355,7 +355,7 @@ class CamShiftNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -444,7 +444,7 @@ namespace camshift class CamShiftNodelet : public opencv_apps::CamShiftNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet camshift/camshift is deprecated, " "and renamed to opencv_apps/camshift."); diff --git a/src/nodelet/color_filter_nodelet.cpp b/src/nodelet/color_filter_nodelet.cpp index 2939b4d4..90af18e9 100644 --- a/src/nodelet/color_filter_nodelet.cpp +++ b/src/nodelet/color_filter_nodelet.cpp @@ -148,7 +148,7 @@ class ColorFilterNodelet : public opencv_apps::Nodelet NODELET_ERROR("Image processing error: %s %s %s %i", e.err.c_str(), e.func.c_str(), e.file.c_str(), e.line); } } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -157,7 +157,7 @@ class ColorFilterNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &ColorFilterNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -165,7 +165,7 @@ class ColorFilterNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -201,7 +201,7 @@ class RGBColorFilterNodelet : public ColorFilterNodeletheader.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -258,7 +258,7 @@ class ContourMomentsNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &ContourMomentsNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -266,7 +266,7 @@ class ContourMomentsNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -300,7 +300,7 @@ namespace contour_moments class ContourMomentsNodelet : public opencv_apps::ContourMomentsNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet contour_moments/contour_moments is deprecated, " "and renamed to opencv_apps/contour_moments."); diff --git a/src/nodelet/convex_hull_nodelet.cpp b/src/nodelet/convex_hull_nodelet.cpp index e2fb95d4..93871823 100644 --- a/src/nodelet/convex_hull_nodelet.cpp +++ b/src/nodelet/convex_hull_nodelet.cpp @@ -207,7 +207,7 @@ class ConvexHullNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -216,7 +216,7 @@ class ConvexHullNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &ConvexHullNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -224,7 +224,7 @@ class ConvexHullNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -258,7 +258,7 @@ namespace convex_hull class ConvexHullNodelet : public opencv_apps::ConvexHullNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet convex_hull/convex_hull is deprecated, " "and renamed to opencv_apps/convex_hull."); diff --git a/src/nodelet/corner_harris_nodelet.cpp b/src/nodelet/corner_harris_nodelet.cpp index 5b9bbde7..a3e89d3b 100644 --- a/src/nodelet/corner_harris_nodelet.cpp +++ b/src/nodelet/corner_harris_nodelet.cpp @@ -182,7 +182,7 @@ class CornerHarrisNodelet : public opencv_apps::Nodelet } } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -191,7 +191,7 @@ class CornerHarrisNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &CornerHarrisNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -199,7 +199,7 @@ class CornerHarrisNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -232,7 +232,7 @@ namespace corner_harris class CornerHarrisNodelet : public opencv_apps::CornerHarrisNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet corner_harris/corner_harris is deprecated, " "and renamed to opencv_apps/corner_harris."); diff --git a/src/nodelet/discrete_fourier_transform_nodelet.cpp b/src/nodelet/discrete_fourier_transform_nodelet.cpp index da46d04e..3305e208 100644 --- a/src/nodelet/discrete_fourier_transform_nodelet.cpp +++ b/src/nodelet/discrete_fourier_transform_nodelet.cpp @@ -83,7 +83,7 @@ class DiscreteFourierTransformNodelet : public opencv_apps::Nodelet doWork(msg, msg->header.frame_id); } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -93,7 +93,7 @@ class DiscreteFourierTransformNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &DiscreteFourierTransformNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -185,7 +185,7 @@ class DiscreteFourierTransformNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -216,7 +216,7 @@ namespace discrete_fourier_transform class DiscreteFourierTransformNodelet : public opencv_apps::DiscreteFourierTransformNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet discrete_fourier_transform/discrete_fourier_transform is deprecated, " "and renamed to opencv_apps/discrete_fourier_transform."); diff --git a/src/nodelet/edge_detection_nodelet.cpp b/src/nodelet/edge_detection_nodelet.cpp index 82d5bf30..fc3ed1f2 100644 --- a/src/nodelet/edge_detection_nodelet.cpp +++ b/src/nodelet/edge_detection_nodelet.cpp @@ -273,7 +273,7 @@ class EdgeDetectionNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -282,7 +282,7 @@ class EdgeDetectionNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &EdgeDetectionNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -290,7 +290,7 @@ class EdgeDetectionNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -327,7 +327,7 @@ namespace edge_detection class EdgeDetectionNodelet : public opencv_apps::EdgeDetectionNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet edge_detection/edge_detection is deprecated, " "and renamed to opencv_apps/edge_detection."); diff --git a/src/nodelet/face_detection_nodelet.cpp b/src/nodelet/face_detection_nodelet.cpp index d3c5376c..371f6a8e 100644 --- a/src/nodelet/face_detection_nodelet.cpp +++ b/src/nodelet/face_detection_nodelet.cpp @@ -212,7 +212,7 @@ class FaceDetectionNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -221,7 +221,7 @@ class FaceDetectionNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &FaceDetectionNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -229,7 +229,7 @@ class FaceDetectionNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -276,7 +276,7 @@ namespace face_detection class FaceDetectionNodelet : public opencv_apps::FaceDetectionNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet face_detection/face_detection is deprecated, " "and renamed to opencv_apps/face_detection."); diff --git a/src/nodelet/face_recognition_nodelet.cpp b/src/nodelet/face_recognition_nodelet.cpp index 244dacd3..4088e78b 100644 --- a/src/nodelet/face_recognition_nodelet.cpp +++ b/src/nodelet/face_recognition_nodelet.cpp @@ -617,7 +617,7 @@ class FaceRecognitionNodelet : public opencv_apps::Nodelet config_ = config; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("subscribe"); img_sub_.subscribe(*it_, "image", 1); @@ -636,7 +636,7 @@ class FaceRecognitionNodelet : public opencv_apps::Nodelet } } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("unsubscribe"); img_sub_.unsubscribe(); @@ -644,7 +644,7 @@ class FaceRecognitionNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); @@ -676,7 +676,7 @@ namespace face_recognition class FaceRecognitionNodelet : public opencv_apps::FaceRecognitionNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet face_recognition/face_recognition is deprecated, " "and renamed to opencv_apps/face_recognition."); diff --git a/src/nodelet/fback_flow_nodelet.cpp b/src/nodelet/fback_flow_nodelet.cpp index 724e9868..5761ad3e 100644 --- a/src/nodelet/fback_flow_nodelet.cpp +++ b/src/nodelet/fback_flow_nodelet.cpp @@ -191,7 +191,7 @@ class FBackFlowNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -200,7 +200,7 @@ class FBackFlowNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &FBackFlowNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -208,7 +208,7 @@ class FBackFlowNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -242,7 +242,7 @@ namespace fback_flow class FBackFlowNodelet : public opencv_apps::FBackFlowNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet fback_flow/fback_flow is deprecated, " "and renamed to opencv_apps/fback_flow."); diff --git a/src/nodelet/find_contours_nodelet.cpp b/src/nodelet/find_contours_nodelet.cpp index 0e05b1bc..506320bd 100644 --- a/src/nodelet/find_contours_nodelet.cpp +++ b/src/nodelet/find_contours_nodelet.cpp @@ -202,7 +202,7 @@ class FindContoursNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -211,7 +211,7 @@ class FindContoursNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &FindContoursNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -219,7 +219,7 @@ class FindContoursNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -254,7 +254,7 @@ namespace find_contours class FindContoursNodelet : public opencv_apps::FindContoursNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet find_contours/find_contours is deprecated, " "and renamed to opencv_apps/find_contours."); diff --git a/src/nodelet/general_contours_nodelet.cpp b/src/nodelet/general_contours_nodelet.cpp index dc886720..b0b7803f 100644 --- a/src/nodelet/general_contours_nodelet.cpp +++ b/src/nodelet/general_contours_nodelet.cpp @@ -236,7 +236,7 @@ class GeneralContoursNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -245,7 +245,7 @@ class GeneralContoursNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &GeneralContoursNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -253,7 +253,7 @@ class GeneralContoursNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -289,7 +289,7 @@ namespace general_contours class GeneralContoursNodelet : public opencv_apps::GeneralContoursNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet general_contours/general_contours is deprecated, " "and renamed to opencv_apps/general_contours."); diff --git a/src/nodelet/goodfeature_track_nodelet.cpp b/src/nodelet/goodfeature_track_nodelet.cpp index 5c63924f..0fae7836 100644 --- a/src/nodelet/goodfeature_track_nodelet.cpp +++ b/src/nodelet/goodfeature_track_nodelet.cpp @@ -202,7 +202,7 @@ class GoodfeatureTrackNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -211,7 +211,7 @@ class GoodfeatureTrackNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &GoodfeatureTrackNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -219,7 +219,7 @@ class GoodfeatureTrackNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -254,7 +254,7 @@ namespace goodfeature_track class GoodfeatureTrackNodelet : public opencv_apps::GoodfeatureTrackNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet goodfeature_track/goodfeature_track is deprecated, " "and renamed to opencv_apps/goodfeature_track."); diff --git a/src/nodelet/hough_circles_nodelet.cpp b/src/nodelet/hough_circles_nodelet.cpp index 681c191a..f8346454 100644 --- a/src/nodelet/hough_circles_nodelet.cpp +++ b/src/nodelet/hough_circles_nodelet.cpp @@ -314,7 +314,7 @@ class HoughCirclesNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -323,7 +323,7 @@ class HoughCirclesNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &HoughCirclesNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -331,7 +331,7 @@ class HoughCirclesNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -378,7 +378,7 @@ namespace hough_circles class HoughCirclesNodelet : public opencv_apps::HoughCirclesNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet hough_circles/hough_circles is deprecated, " "and renamed to opencv_apps/hough_circles."); diff --git a/src/nodelet/hough_lines_nodelet.cpp b/src/nodelet/hough_lines_nodelet.cpp index 98fec48a..6e200014 100644 --- a/src/nodelet/hough_lines_nodelet.cpp +++ b/src/nodelet/hough_lines_nodelet.cpp @@ -267,7 +267,7 @@ class HoughLinesNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -276,7 +276,7 @@ class HoughLinesNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &HoughLinesNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -284,7 +284,7 @@ class HoughLinesNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -321,7 +321,7 @@ namespace hough_lines class HoughLinesNodelet : public opencv_apps::HoughLinesNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet hough_lines/hough_lines is deprecated, " "and renamed to opencv_apps/hough_lines."); diff --git a/src/nodelet/lk_flow_nodelet.cpp b/src/nodelet/lk_flow_nodelet.cpp index 0d17bb8c..867b804f 100644 --- a/src/nodelet/lk_flow_nodelet.cpp +++ b/src/nodelet/lk_flow_nodelet.cpp @@ -294,7 +294,7 @@ class LKFlowNodelet : public opencv_apps::Nodelet return true; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -303,7 +303,7 @@ class LKFlowNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &LKFlowNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -311,7 +311,7 @@ class LKFlowNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -359,7 +359,7 @@ namespace lk_flow class LKFlowNodelet : public opencv_apps::LKFlowNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet lk_flow/lk_flow is deprecated, " "and renamed to opencv_apps/lk_flow."); diff --git a/src/nodelet/people_detect_nodelet.cpp b/src/nodelet/people_detect_nodelet.cpp index 45171780..ce94e2d3 100644 --- a/src/nodelet/people_detect_nodelet.cpp +++ b/src/nodelet/people_detect_nodelet.cpp @@ -192,7 +192,7 @@ class PeopleDetectNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -201,7 +201,7 @@ class PeopleDetectNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &PeopleDetectNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -209,7 +209,7 @@ class PeopleDetectNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -245,7 +245,7 @@ namespace people_detect class PeopleDetectNodelet : public opencv_apps::PeopleDetectNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet people_detect/people_detect is deprecated, " "and renamed to opencv_apps/people_detect."); diff --git a/src/nodelet/phase_corr_nodelet.cpp b/src/nodelet/phase_corr_nodelet.cpp index f6e17c39..df2f2c1b 100644 --- a/src/nodelet/phase_corr_nodelet.cpp +++ b/src/nodelet/phase_corr_nodelet.cpp @@ -184,7 +184,7 @@ class PhaseCorrNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -193,7 +193,7 @@ class PhaseCorrNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &PhaseCorrNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -201,7 +201,7 @@ class PhaseCorrNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -235,7 +235,7 @@ namespace phase_corr class PhaseCorrNodelet : public opencv_apps::PhaseCorrNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet phase_corr/phase_corr is deprecated, " "and renamed to opencv_apps/phase_corr."); diff --git a/src/nodelet/pyramids_nodelet.cpp b/src/nodelet/pyramids_nodelet.cpp index 8eeba0d4..469f48bf 100644 --- a/src/nodelet/pyramids_nodelet.cpp +++ b/src/nodelet/pyramids_nodelet.cpp @@ -148,7 +148,7 @@ class PyramidsNodelet : public opencv_apps::Nodelet } } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -157,7 +157,7 @@ class PyramidsNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &PyramidsNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -165,7 +165,7 @@ class PyramidsNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -197,7 +197,7 @@ namespace pyramids class PyramidsNodelet : public opencv_apps::PyramidsNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet pyramids/pyramids is deprecated, " "and renamed to opencv_apps/pyramids."); diff --git a/src/nodelet/segment_objects_nodelet.cpp b/src/nodelet/segment_objects_nodelet.cpp index 58e89d78..a6b276af 100644 --- a/src/nodelet/segment_objects_nodelet.cpp +++ b/src/nodelet/segment_objects_nodelet.cpp @@ -232,7 +232,7 @@ class SegmentObjectsNodelet : public opencv_apps::Nodelet return true; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -241,7 +241,7 @@ class SegmentObjectsNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &SegmentObjectsNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -249,7 +249,7 @@ class SegmentObjectsNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -292,7 +292,7 @@ namespace segment_objects class SegmentObjectsNodelet : public opencv_apps::SegmentObjectsNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet segment_objects/segment_objects is deprecated, " "and renamed to opencv_apps/segment_objects."); diff --git a/src/nodelet/simple_compressed_example_nodelet.cpp b/src/nodelet/simple_compressed_example_nodelet.cpp index 610af320..c99605b5 100644 --- a/src/nodelet/simple_compressed_example_nodelet.cpp +++ b/src/nodelet/simple_compressed_example_nodelet.cpp @@ -226,7 +226,7 @@ note : hydro 1.10.18, indigo : 1.11.13 ... class SimpleCompressedExampleNodelet : public nodelet::Nodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { simple_compressed_example::ImageConverter ic; ros::spin(); @@ -240,7 +240,7 @@ namespace simple_compressed_example class SimpleCompressedExampleNodelet : public opencv_apps::SimpleCompressedExampleNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet simple_compressed_example/simple_compressed_example is deprecated, " "and renamed to opencv_apps/simple_compressed_example."); diff --git a/src/nodelet/simple_example_nodelet.cpp b/src/nodelet/simple_example_nodelet.cpp index c34a2c22..70b0ce85 100644 --- a/src/nodelet/simple_example_nodelet.cpp +++ b/src/nodelet/simple_example_nodelet.cpp @@ -120,7 +120,7 @@ class ImageConverter class SimpleExampleNodelet : public nodelet::Nodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { simple_example::ImageConverter ic; ros::spin(); @@ -134,7 +134,7 @@ namespace simple_example class SimpleExampleNodelet : public opencv_apps::SimpleExampleNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet simple_example/simple_example is deprecated, " "and renamed to opencv_apps/simple_example."); diff --git a/src/nodelet/simple_flow_nodelet.cpp b/src/nodelet/simple_flow_nodelet.cpp index a8b27743..c9629fe6 100644 --- a/src/nodelet/simple_flow_nodelet.cpp +++ b/src/nodelet/simple_flow_nodelet.cpp @@ -224,7 +224,7 @@ class SimpleFlowNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -233,7 +233,7 @@ class SimpleFlowNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &SimpleFlowNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -241,7 +241,7 @@ class SimpleFlowNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -276,7 +276,7 @@ namespace simple_flow class SimpleFlowNodelet : public opencv_apps::SimpleFlowNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet simple_flow/simple_flow is deprecated, " "and renamed to opencv_apps/simple_flow."); diff --git a/src/nodelet/smoothing_nodelet.cpp b/src/nodelet/smoothing_nodelet.cpp index c1d582a9..6d6bff8e 100644 --- a/src/nodelet/smoothing_nodelet.cpp +++ b/src/nodelet/smoothing_nodelet.cpp @@ -189,7 +189,7 @@ class SmoothingNodelet : public opencv_apps::Nodelet prev_stamp_ = msg->header.stamp; } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -198,7 +198,7 @@ class SmoothingNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &SmoothingNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -206,7 +206,7 @@ class SmoothingNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -240,7 +240,7 @@ namespace smoothing class SmoothingNodelet : public opencv_apps::SmoothingNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet smoothing/smoothing is deprecated, " "and renamed to opencv_apps/smoothing."); diff --git a/src/nodelet/threshold_nodelet.cpp b/src/nodelet/threshold_nodelet.cpp index 35e59985..79fabf74 100644 --- a/src/nodelet/threshold_nodelet.cpp +++ b/src/nodelet/threshold_nodelet.cpp @@ -90,7 +90,7 @@ class ThresholdNodelet : public opencv_apps::Nodelet doWork(msg, msg->header.frame_id); } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -99,7 +99,7 @@ class ThresholdNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &ThresholdNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -147,7 +147,7 @@ class ThresholdNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -177,7 +177,7 @@ namespace threshold class ThresholdNodelet : public opencv_apps::ThresholdNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet threshold/threshold is deprecated, " "and renamed to opencv_apps/threshold."); diff --git a/src/nodelet/watershed_segmentation_nodelet.cpp b/src/nodelet/watershed_segmentation_nodelet.cpp index 97fada5f..c4465bf5 100644 --- a/src/nodelet/watershed_segmentation_nodelet.cpp +++ b/src/nodelet/watershed_segmentation_nodelet.cpp @@ -293,7 +293,7 @@ class WatershedSegmentationNodelet : public opencv_apps::Nodelet } } - void subscribe() override + void subscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Subscribing to image topic."); if (config_.use_camera_info) @@ -302,7 +302,7 @@ class WatershedSegmentationNodelet : public opencv_apps::Nodelet img_sub_ = it_->subscribe("image", queue_size_, &WatershedSegmentationNodelet::imageCallback, this); } - void unsubscribe() override + void unsubscribe() // NOLINT(modernize-use-override) { NODELET_DEBUG("Unsubscribing from image topic."); img_sub_.shutdown(); @@ -310,7 +310,7 @@ class WatershedSegmentationNodelet : public opencv_apps::Nodelet } public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { Nodelet::onInit(); it_ = boost::shared_ptr(new image_transport::ImageTransport(*nh_)); @@ -361,7 +361,7 @@ namespace watershed_segmentation class WatershedSegmentationNodelet : public opencv_apps::WatershedSegmentationNodelet { public: - void onInit() override + virtual void onInit() // NOLINT(modernize-use-override) { ROS_WARN("DeprecationWarning: Nodelet watershed_segmentation/watershed_segmentation is deprecated, " "and renamed to opencv_apps/watershed_segmentation.");