Check camera sensors have non-zero width or height (backport #480) (#482

) Signed-off-by: Alejandro Hernández Cordero <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]>
gazebosim · Nov 11, 2024 · 4fcd8ed · 4fcd8ed
1 parent fec89fb
commit 4fcd8ed
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 6 deletions.
diff --git a/src/BoundingBoxCameraSensor.cc b/src/BoundingBoxCameraSensor.cc
@@ -316,6 +316,13 @@ bool BoundingBoxCameraSensor::CreateCamera()
   auto width = sdfCamera->ImageWidth();
   auto height = sdfCamera->ImageHeight();
 
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create a bounding box camera sensor with 0 width or "
+          << "height. " << std::endl;
+    return false;
+  }
+
   // Set Camera Properties
   this->dataPtr->rgbCamera->SetImageFormat(rendering::PF_R8G8B8);
   this->dataPtr->rgbCamera->SetImageWidth(width);

diff --git a/src/CameraSensor.cc b/src/CameraSensor.cc
@@ -212,6 +212,13 @@ bool CameraSensor::CreateCamera()
   unsigned int width = cameraSdf->ImageWidth();
   unsigned int height = cameraSdf->ImageHeight();
 
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create a camera sensor with 0 width or height."
+          << std::endl;
+    return false;
+  }
+
   this->dataPtr->camera = this->Scene()->CreateCamera(this->Name());
   this->dataPtr->camera->SetImageWidth(width);
   this->dataPtr->camera->SetImageHeight(height);

diff --git a/src/DepthCameraSensor.cc b/src/DepthCameraSensor.cc
@@ -324,8 +324,15 @@ bool DepthCameraSensor::CreateCamera()
     return false;
   }
 
-  int width = cameraSdf->ImageWidth();
-  int height = cameraSdf->ImageHeight();
+  unsigned int width = cameraSdf->ImageWidth();
+  unsigned int height = cameraSdf->ImageHeight();
+
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create a depth camera sensor with 0 width or height."
+          << std::endl;
+    return false;
+  }
 
   double far = cameraSdf->FarClip();
   double near = cameraSdf->NearClip();

diff --git a/src/RgbdCameraSensor.cc b/src/RgbdCameraSensor.cc
@@ -276,8 +276,15 @@ bool RgbdCameraSensor::CreateCameras()
 
   this->PopulateInfo(cameraSdf);
 
-  int width = cameraSdf->ImageWidth();
-  int height = cameraSdf->ImageHeight();
+  unsigned int width = cameraSdf->ImageWidth();
+  unsigned int height = cameraSdf->ImageHeight();
+
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create an RGBD camera sensor with 0 width or height."
+          << std::endl;
+    return false;
+  }
 
   this->dataPtr->depthCamera =
       this->Scene()->CreateDepthCamera(this->Name());

diff --git a/src/SegmentationCameraSensor.cc b/src/SegmentationCameraSensor.cc
@@ -345,6 +345,13 @@ bool SegmentationCameraSensor::CreateCamera()
   auto width = sdfCamera->ImageWidth();
   auto height = sdfCamera->ImageHeight();
 
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create a segmentation camera sensor with 0 width or "
+          << "height." << std::endl;
+    return false;
+  }
+
   math::Angle angle = sdfCamera->HorizontalFov();
   if (angle < 0.01 || angle > GZ_PI*2)
   {

diff --git a/src/ThermalCameraSensor.cc b/src/ThermalCameraSensor.cc
@@ -244,8 +244,15 @@ bool ThermalCameraSensor::CreateCamera()
     return false;
   }
 
-  int width = cameraSdf->ImageWidth();
-  int height = cameraSdf->ImageHeight();
+  unsigned int width = cameraSdf->ImageWidth();
+  unsigned int height = cameraSdf->ImageHeight();
+
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create a thermal camera sensor with 0 width or height."
+          << std::endl;
+    return false;
+  }
 
   sdf::PixelFormatType pixelFormat = cameraSdf->PixelFormat();
 

diff --git a/src/WideAngleCameraSensor.cc b/src/WideAngleCameraSensor.cc
@@ -217,6 +217,13 @@ bool WideAngleCameraSensor::CreateCamera()
   unsigned int width = cameraSdf->ImageWidth();
   unsigned int height = cameraSdf->ImageHeight();
 
+  if (width == 0u || height == 0u)
+  {
+    gzerr << "Unable to create a wide angle camera sensor with 0 width or "
+          << "height." << std::endl;
+    return false;
+  }
+
   this->dataPtr->camera = this->Scene()->CreateWideAngleCamera(this->Name());
 
   if (!this->dataPtr->camera)