Skip to content
Snippets Groups Projects
Commit 8c76b491 authored by Sebastian Hahta's avatar Sebastian Hahta
Browse files

FileStorage release()

parent aca25726
No related branches found
No related tags found
1 merge request!87Bug/intrinsic scaling
Pipeline #12648 passed
...@@ -89,6 +89,8 @@ bool Calibrate::_loadCalibration(cv::Size img_size, std::pair<Mat, Mat> &map1, s ...@@ -89,6 +89,8 @@ bool Calibrate::_loadCalibration(cv::Size img_size, std::pair<Mat, Mat> &map1, s
D[1].copyTo(D2_); D[1].copyTo(D2_);
} }
fs.release();
CHECK(M1_.size() == Size(3, 3)); CHECK(M1_.size() == Size(3, 3));
CHECK(M2_.size() == Size(3, 3)); CHECK(M2_.size() == Size(3, 3));
CHECK(D1_.size() == Size(5, 1)); CHECK(D1_.size() == Size(5, 1));
...@@ -116,12 +118,15 @@ bool Calibrate::_loadCalibration(cv::Size img_size, std::pair<Mat, Mat> &map1, s ...@@ -116,12 +118,15 @@ bool Calibrate::_loadCalibration(cv::Size img_size, std::pair<Mat, Mat> &map1, s
fs["P1"] >> P1_; fs["P1"] >> P1_;
fs["P2"] >> P2_; fs["P2"] >> P2_;
fs["Q"] >> Q_; fs["Q"] >> Q_;
fs.release();
img_size_ = img_size; img_size_ = img_size;
// TODO: normalize calibration // TODO: normalize calibration
double scale_x = ((double) img_size.width) / 1280.0; double scale_x = ((double) img_size.width) / 1280.0;
double scale_y = ((double) img_size.height) / 720.0; double scale_y = ((double) img_size.height) / 720.0;
Mat scale(cv::Size(3, 3), CV_64F, 0.0); Mat scale(cv::Size(3, 3), CV_64F, 0.0);
scale.at<double>(0, 0) = (double) scale_x; scale.at<double>(0, 0) = (double) scale_x;
scale.at<double>(1, 1) = (double) scale_y; scale.at<double>(1, 1) = (double) scale_y;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment