Fixed compilation warnings

This commit is contained in:
matlabbe
2022-01-16 15:27:52 -05:00
parent 9622fe8393
commit 7a5c50cb0e
4 changed files with 15 additions and 6 deletions

View File

@@ -368,8 +368,8 @@ LaserScan LaserScan::clone() const
float & LaserScan::field(unsigned int pointIndex, unsigned int channelOffset)
{
UASSERT(pointIndex < data_.cols);
UASSERT(channelOffset < data_.channels());
UASSERT(pointIndex < (unsigned int)data_.cols);
UASSERT(channelOffset < (unsigned int)data_.channels());
return data_.ptr<float>(0, pointIndex)[channelOffset];
}

View File

@@ -205,7 +205,14 @@ Transform OdometryMono::computeTransform(SensorData & data, const Transform & gu
{
cv::Mat newFrame;
cv::cvtColor(data.imageRaw(), newFrame, cv::COLOR_BGR2GRAY);
data.setImageRaw(newFrame);
if(data.stereoCameraModel().isValidForProjection())
{
data.setStereoImage(newFrame, data.rightRaw(), data.stereoCameraModel());
}
else
{
data.setRGBDImage(newFrame, data.depthRaw(), data.cameraModels());
}
}
if(!localMap_.empty())

View File

@@ -78,7 +78,9 @@ struct big_any_policy : typed_base_any_policy<T>
{
virtual void static_delete(void** x)
{
if (* x) delete (* reinterpret_cast<T**>(x)); *x = NULL;
if (* x)
delete (* reinterpret_cast<T**>(x));
*x = NULL;
}
virtual void copy_from_value(void const* src, void** dest)
{