diff --git a/rover/rover_camera/CMakeLists.txt b/rover/rover_camera/CMakeLists.txt
index 59d3782..e3358a1 100644
--- a/rover/rover_camera/CMakeLists.txt
+++ b/rover/rover_camera/CMakeLists.txt
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 2.8)
project(rover_camera)
+add_compile_options(-std=c++11)
+
find_package(catkin REQUIRED COMPONENTS cv_bridge image_transport message_generation sensor_msgs)
# add the resized image message
diff --git a/rover/rover_camera/launch/example.launch b/rover/rover_camera/launch/example.launch
index 93e36bc..1558e6e 100644
--- a/rover/rover_camera/launch/example.launch
+++ b/rover/rover_camera/launch/example.launch
@@ -1,22 +1,23 @@
-
-
+
+
-
+
-
+
diff --git a/rover/rover_camera/src/rover_camera.cpp b/rover/rover_camera/src/rover_camera.cpp
index 38ec853..8735c59 100644
--- a/rover/rover_camera/src/rover_camera.cpp
+++ b/rover/rover_camera/src/rover_camera.cpp
@@ -1,4 +1,4 @@
-#include
+#include
#include
#include
@@ -41,11 +41,14 @@ int main(int argc, char** argv)
return -1;
}
+ std::string large_image_node_name = "image_" + std::to_string(large_image_width) + "x" + std::to_string(large_image_height);
+ std::string small_image_node_name = "image_" + std::to_string(small_image_width) + "x" + std::to_string(small_image_height);
+
image_transport::ImageTransport full_res_image_transport(node_handle);
image_transport::ImageTransport lower_res_image_transport(node_handle);
- image_transport::Publisher full_size_publisher = full_res_image_transport.advertise("image_720p", 1);
- image_transport::Publisher lower_size_publisher = lower_res_image_transport.advertise("image_360p", 1);
+ image_transport::Publisher full_size_publisher = full_res_image_transport.advertise(large_image_node_name, 1);
+ image_transport::Publisher lower_size_publisher = lower_res_image_transport.advertise(small_image_node_name, 1);
cv::Mat image;
cv::Mat image_smaller;
diff --git a/rover/zed_wrapper/launch/display.launch b/rover/zed_wrapper/launch/display.launch
old mode 100644
new mode 100755
diff --git a/rover/zed_wrapper/launch/zed.launch b/rover/zed_wrapper/launch/zed.launch
old mode 100644
new mode 100755
diff --git a/rover/zed_wrapper/launch/zed_camera.launch b/rover/zed_wrapper/launch/zed_camera.launch
old mode 100644
new mode 100755
diff --git a/rover/zed_wrapper/launch/zed_multi_cam.launch b/rover/zed_wrapper/launch/zed_multi_cam.launch
old mode 100644
new mode 100755
diff --git a/rover/zed_wrapper/launch/zed_multi_gpu.launch b/rover/zed_wrapper/launch/zed_multi_gpu.launch
old mode 100644
new mode 100755