diff --git a/include/mynteye/types.h b/include/mynteye/types.h index 8c710ed..07adc2b 100644 --- a/include/mynteye/types.h +++ b/include/mynteye/types.h @@ -464,7 +464,7 @@ struct MYNTEYE_API IntrinsicsEquidistant : public IntrinsicsBase { std::uint16_t width; /** The height of the image in pixels */ std::uint16_t height; - /** The distortion coefficients k2,k3,k4,k5,mu,mv,u0,v0*/ + /** The distortion coefficients: k2,k3,k4,k5,mu,mv,u0,v0 */ double coeffs[8]; }; diff --git a/src/mynteye/api/processor/rectify_processor.cc b/src/mynteye/api/processor/rectify_processor.cc index 16398cc..281ab2c 100644 --- a/src/mynteye/api/processor/rectify_processor.cc +++ b/src/mynteye/api/processor/rectify_processor.cc @@ -55,7 +55,7 @@ void RectifyProcessor::NotifyImageParamsChanged() { *std::dynamic_pointer_cast(in_right), device_->GetExtrinsics(Stream::RIGHT, Stream::LEFT)); } else { - // toido + // todo } } @@ -116,40 +116,6 @@ void RectifyProcessor::InitParams( cv::initUndistortRectifyMap(M2, D2, R2, P2, size, CV_16SC2, map21, map22); } -// enum class CalibrationModel : std::uint8_t { -// /** Unknow */ -// CALIB_MODEL_UNKNOW = 0, -// /** Pinhole */ -// CALIB_MODEL_PINHOLE = 1, -// /** Equidistant: KANNALA_BRANDT */ -// CALIB_MODEL_KANNALA_BRANDT = 2, -// // CALIB_MODEL_SCARAMUZZA, -// // CALIB_MODEL_MEI, -// }; - -// /** -// * @ingroup calibration -// * Stream intrinsics (Equidistant: KANNALA_BRANDT) -// */ -// struct MYNTEYE_API IntrinsicsEquidistant : public IntrinsicsBase { -// IntrinsicsEquidistant() { -// calib_model = CalibrationModel::CALIB_MODEL_KANNALA_BRANDT; -// } -// /** The width of the image in pixels */ -// std::uint16_t width; -// /** The height of the image in pixels */ -// std::uint16_t height; -// /** The distortion coefficients */ -// double k2; -// double k3; -// double k4; -// double k5; -// double mu; -// double mv; -// double u0; -// double v0; -// }; - void RectifyProcessor::InitParams( IntrinsicsEquidistant in_left, IntrinsicsEquidistant in_right, @@ -189,5 +155,4 @@ void RectifyProcessor::InitParams( cv::initUndistortRectifyMap(M2, D2, R2, P2, size, CV_16SC2, map21, map22); } - MYNTEYE_END_NAMESPACE diff --git a/src/mynteye/types.cc b/src/mynteye/types.cc index 7a9ff20..1cab68e 100644 --- a/src/mynteye/types.cc +++ b/src/mynteye/types.cc @@ -198,8 +198,7 @@ std::ostream &operator<<(std::ostream &os, const IntrinsicsPinhole &in) { os << in.coeffs[i] << ", "; return os << in.coeffs[4] << "]"; } -/** The distortion coefficients k2,k3,k4,k5,mu,mv,u0,v0*/ - double coeffs[8]; + std::ostream &operator<<(std::ostream &os, const IntrinsicsEquidistant &in) { os << "equidistant, " << FULL_PRECISION << "width: " << in.width << ", height: " << in.height