i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build warnings about variables not used in CameraRGBD and CameraStereo classes (depending on which sensor is available)

Browse Source
This commit is contained in:
matlabbe
2016-12-02 12:29:38 -05:00
parent f2dbfa9b33
commit a5f4468c54
4 changed files with 74 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
corelib/src/CameraRGBD.cpp
View File

@@ -382,21 +382,18 @@ CameraOpenNI2::CameraOpenNI2(
Type type,
float imageRate,
const rtabmap::Transform & localTransform) :
Camera(imageRate, localTransform),
_type(type),
Camera(imageRate, localTransform)
#ifdef RTABMAP_OPENNI2
,
_type(type),
_device(new openni::Device()),
_color(new openni::VideoStream()),
_depth(new openni::VideoStream()),
#else
_device(0),
_color(0),
_depth(0),
#endif
_depthFx(0.0f),
_depthFy(0.0f),
_deviceId(deviceId),
_openNI2StampsAndIDsUsed(false)
#endif
{
}
@@ -488,6 +485,13 @@ bool CameraOpenNI2::setMirroring(bool enabled)
return false;
}
void CameraOpenNI2::setOpenNI2StampsAndIDsUsed(bool used)
{
#ifdef RTABMAP_OPENNI2
_openNI2StampsAndIDsUsed = used;
#endif
}
bool CameraOpenNI2::init(const std::string & calibrationFolder, const std::string & cameraName)
{
#ifdef RTABMAP_OPENNI2
@@ -1122,11 +1126,14 @@ bool CameraFreenect::available()
}
CameraFreenect::CameraFreenect(int deviceId, Type type, float imageRate, const Transform & localTransform) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_FREENECT
,
deviceId_(deviceId),
type_(type),
ctx_(0),
freenectDevice_(0)
#endif
{
#ifdef RTABMAP_FREENECT
if(freenect_init(&ctx_, NULL) < 0) UERROR("Cannot initialize freenect library");
@@ -1333,7 +1340,9 @@ CameraFreenect2::CameraFreenect2(
bool bilateralFiltering,
bool edgeAwareFiltering,
bool noiseFiltering) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_FREENECT2
,
deviceId_(deviceId),
type_(type),
freenect2_(0),
@@ -1345,6 +1354,7 @@ CameraFreenect2::CameraFreenect2(
bilateralFiltering_(bilateralFiltering),
edgeAwareFiltering_(edgeAwareFiltering),
noiseFiltering_(noiseFiltering)
#endif
{
#ifdef RTABMAP_FREENECT2
UASSERT(minKinect2Depth_ < maxKinect2Depth_ && minKinect2Depth_>0 && maxKinect2Depth_>0 && maxKinect2Depth_<=65.535f);
@@ -1965,12 +1975,15 @@ bool CameraRealSense::available()
}
CameraRealSense::CameraRealSense(int device, int presetRGB, int presetDepth, float imageRate, const rtabmap::Transform & localTransform) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_REALSENSE
,
ctx_(0),
dev_(0),
deviceId_(device),
presetRGB_(presetRGB),
presetDepth_(presetDepth)
#endif
{
UDEBUG("");
}

37
corelib/src/CameraStereo.cpp
View File

@@ -347,8 +347,11 @@ bool CameraStereoDC1394::available()
}
CameraStereoDC1394::CameraStereoDC1394(float imageRate, const Transform & localTransform) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_DC1394
,
device_(0)
#endif
{
#ifdef RTABMAP_DC1394
device_ = new DC1394Device();
@@ -401,7 +404,11 @@ bool CameraStereoDC1394::init(const std::string & calibrationFolder, const std::
bool CameraStereoDC1394::isCalibrated() const
{
#ifdef RTABMAP_DC1394
return stereoModel_.isValidForProjection();
#else
return false;
#endif
}
std::string CameraStereoDC1394::getSerial() const
@@ -460,9 +467,12 @@ SensorData CameraStereoDC1394::captureImage(CameraInfo * info)
// CameraTriclops
//
CameraStereoFlyCapture2::CameraStereoFlyCapture2(float imageRate, const Transform & localTransform) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_FLYCAPTURE2
,
camera_(0),
triclopsCtx_(0)
#endif
{
#ifdef RTABMAP_FLYCAPTURE2
camera_ = new FlyCapture2::Camera();
@@ -757,7 +767,9 @@ CameraStereoZed::CameraStereoZed(
float imageRate,
const Transform & localTransform,
bool selfCalibration) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_ZED
,
zed_(0),
src_(CameraVideo::kUsbDevice),
usbDevice_(deviceId),
@@ -769,6 +781,7 @@ CameraStereoZed::CameraStereoZed(
confidenceThr_(confidenceThr),
computeOdometry_(computeOdometry),
lost_(true)
#endif
{
UDEBUG("");
#ifdef RTABMAP_ZED
@@ -788,7 +801,9 @@ CameraStereoZed::CameraStereoZed(
float imageRate,
const Transform & localTransform,
bool selfCalibration) :
Camera(imageRate, localTransform),
Camera(imageRate, localTransform)
#ifdef RTABMAP_ZED
,
zed_(0),
src_(CameraVideo::kVideoFile),
usbDevice_(0),
@@ -800,6 +815,7 @@ CameraStereoZed::CameraStereoZed(
confidenceThr_(confidenceThr),
computeOdometry_(computeOdometry),
lost_(true)
#endif
{
UDEBUG("");
#ifdef RTABMAP_ZED
@@ -896,7 +912,11 @@ bool CameraStereoZed::init(const std::string & calibrationFolder, const std::str
bool CameraStereoZed::isCalibrated() const
{
#ifdef RTABMAP_ZED
return stereoModel_.isValidForProjection();
#else
return false;
#endif
}
std::string CameraStereoZed::getSerial() const
@@ -910,6 +930,15 @@ std::string CameraStereoZed::getSerial() const
return "";
}
bool CameraStereoZed::odomProvided() const
{
#ifdef RTABMAP_ZED
return computeOdometry_;
#else
return false;
#endif
}
SensorData CameraStereoZed::captureImage(CameraInfo * info)
{
SensorData data;