From 861cc437f447272fd8dd3a8b2cfdf5139c343e97 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Tue, 13 Sep 2016 18:57:44 -0400 Subject: [PATCH] Updated Freenect2 calibration lookup names --- corelib/src/CameraRGBD.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/corelib/src/CameraRGBD.cpp b/corelib/src/CameraRGBD.cpp index 65103548..61935632 100644 --- a/corelib/src/CameraRGBD.cpp +++ b/corelib/src/CameraRGBD.cpp @@ -1468,6 +1468,7 @@ bool CameraFreenect2::init(const std::string & calibrationFolder, const std::str reg_ = new libfreenect2::Registration(depthParams, colorParams); // look for calibration files + stereoModel_ = StereoCameraModel(); if(!calibrationFolder.empty()) { std::string calibrationName = dev_->getSerialNumber(); @@ -1475,9 +1476,13 @@ bool CameraFreenect2::init(const std::string & calibrationFolder, const std::str { calibrationName = cameraName; } + stereoModel_.setName(calibrationName, "depth", "rgb"); if(!stereoModel_.load(calibrationFolder, calibrationName, false)) { - UWARN("Missing calibration files for camera \"%s\" in \"%s\" folder, default calibration used.", + UWARN("Missing calibration files for camera \"%s\" in \"%s\" folder, default calibration " + "is used. Note that from version 0.11.10, calibration suffixes for Freenect2 driver have " + "changed from \"_left\"->\"_depth\" and \"_right\"->\"_rgb\". You can safely rename " + "the calibration files to avoid recalibrating.", calibrationName.c_str(), calibrationFolder.c_str()); } else