merge

src/mvbluefox3_camera_driver.cpp

@@ -302,10 +302,10 @@ void Mvbluefox3CameraDriver::GetROSImage(const int &ncam, sensor_msgs::Image &im
         encoding = "8UC1";
         switch (bp) 
         {
-          case 1: encoding = "mono8"; break;
+          case 1: encoding = "mono8"; break; // FIX: Should be 8UC1 but changed because cv_bridge cannot convert formats
           case 2: encoding = "8UC2"; break;
-          case 3: encoding = "rgb8"; break;
-          case 4: encoding = "8UC4"; break;
+          case 3: encoding = "rgb8"; break;  // FIX: Should be 8UC3 but changed because cv_bridge cannot convert formats
+          case 4: encoding = "rgba8"; break; // FIX: Should be 8UC4 but changed because cv_bridge cannot convert formats
           default: ROS_WARN("Invalid depth. Depth not implemented here."); break;
         }
       }
@@ -314,7 +314,7 @@ void Mvbluefox3CameraDriver::GetROSImage(const int &ncam, sensor_msgs::Image &im
         encoding = "16UC1";
         switch (bp) 
         {
-          case 1: encoding = "16UC1"; break;
+          case 1: encoding = "mono16"; break; // FIX: Should be 16UC1 but changed because cv_bridge cannot convert formats
           case 2: encoding = "16UC2"; break;
           case 3: encoding = "16UC3"; break;
           case 4: encoding = "16UC4"; break;