Skip to content

Commit 6e148d5

Browse files
committed
fix: Changed cv_bridge.h import to cv_bridge.hpp in three files and deleted gmock-generated-matchers.h import in matchers.hpp file, as gmock-generated-matchers is not part of new versions of gmock
1 parent 818f368 commit 6e148d5

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

spot_driver/src/api/default_image_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#include <bosdyn/api/directory.pb.h>
66
#include <bosdyn/api/image.pb.h>
7-
#include <cv_bridge/cv_bridge.h>
87
#include <google/protobuf/duration.pb.h>
98
#include <builtin_interfaces/msg/time.hpp>
9+
#include <cv_bridge/cv_bridge.hpp>
1010
#include <geometry_msgs/msg/quaternion.hpp>
1111
#include <geometry_msgs/msg/transform_stamped.hpp>
1212
#include <geometry_msgs/msg/vector3.hpp>

spot_driver/src/conversions/decompress_images.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <bosdyn/api/directory.pb.h>
44
#include <bosdyn/api/image.pb.h>
5-
#include <cv_bridge/cv_bridge.h>
65
#include <google/protobuf/duration.pb.h>
6+
#include <cv_bridge/cv_bridge.hpp>
77
#include <opencv2/imgcodecs.hpp>
88
#include <sensor_msgs/msg/image.hpp>
99
#include <spot_driver/api/default_time_sync_api.hpp>

spot_driver/src/image_stitcher/image_stitcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All rights reserved.
2-
#include <cv_bridge/cv_bridge.h>
32
#include <builtin_interfaces/msg/detail/time__struct.hpp>
3+
#include <cv_bridge/cv_bridge.hpp>
44
#include <geometry_msgs/msg/detail/transform_stamped__struct.hpp>
55
#include <image_transport/subscriber_filter.hpp>
66
#include <memory>

spot_driver/test/include/spot_driver/matchers.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#pragma once
44

5-
#include <gmock/gmock-generated-matchers.h>
5+
// #include <gmock/gmock-generated-matchers.h>
66
#include <gmock/gmock-matchers.h>
77
#include <gmock/gmock.h>
88
#include <google/protobuf/timestamp.pb.h>

0 commit comments

Comments
 (0)