Match parameter names

Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com>

Author: shameekganguly

include/gz/sensors/DepthCameraSensor.hh

@@ -105,12 +105,12 @@ namespace gz
                     const std::string &/*_format*/);
 
       /// \brief Point cloud data callback used to get the data from the sensor
-      /// \param[in] _data pointer to the data from the sensor
+      /// \param[in] _scan pointer to the data from the sensor
       /// \param[in] _width width of the point cloud image
       /// \param[in] _height height of the point cloud image
       /// \param[in] _channel bytes used for the point cloud data
       /// \param[in] _format string with the format
-      public: void OnNewRgbPointCloud(const float *_data,
+      public: void OnNewRgbPointCloud(const float *_scan,
                     unsigned int _width, unsigned int _height,
                     unsigned int /*_channels*/,
                     const std::string &/*_format*/);

src/CameraSensor.cc

@@ -671,7 +671,7 @@ bool CameraSensor::Update(const std::chrono::steady_clock::duration &_now)
       }
       catch(...)
       {
-        ignerr << "Exception thrown in an image callback.\n";
+        gzerr << "Exception thrown in an image callback.\n";
       }
     }
 

src/GpuLidarSensor.cc

@@ -239,7 +239,7 @@ bool GpuLidarSensor::CreateLidar()
 }
 
 /////////////////////////////////////////////////
-void GpuLidarSensor::OnNewLidarFrame(const float *_data,
+void GpuLidarSensor::OnNewLidarFrame(const float *_scan,
     unsigned int _width, unsigned int _height, unsigned int _channels,
     const std::string &_format)
 {
@@ -251,11 +251,11 @@ void GpuLidarSensor::OnNewLidarFrame(const float *_data,
   if (!this->laserBuffer)
     this->laserBuffer = new float[samples];
 
-  memcpy(this->laserBuffer, _data, lidarBufferSize);
+  memcpy(this->laserBuffer, _scan, lidarBufferSize);
 
   if (this->dataPtr->lidarEvent.ConnectionCount() > 0)
   {
-    this->dataPtr->lidarEvent(_data, _width, _height, _channels, _format);
+    this->dataPtr->lidarEvent(_scan, _width, _height, _channels, _format);
   }
 }
 

src/SegmentationCameraSensor.cc

@@ -406,12 +406,12 @@ rendering::SegmentationCameraPtr SegmentationCameraSensor::SegmentationCamera()
 
 /////////////////////////////////////////////////
 void SegmentationCameraSensor::OnNewSegmentationFrame(const uint8_t * _data,
-  unsigned int _width, unsigned int _height, unsigned int _channles,
+  unsigned int _width, unsigned int _height, unsigned int _channels,
   const std::string &/*_format*/)
 {
   std::lock_guard<std::mutex> lock(this->dataPtr->mutex);
 
-  unsigned int bufferSize = _width * _height * _channles;
+  unsigned int bufferSize = _width * _height * _channels;
 
   if (!this->dataPtr->segmentationColoredBuffer)
     this->dataPtr->segmentationColoredBuffer = new uint8_t[bufferSize];