Skip to content

4.x: Fix data corruption in WeChatQRCode::impl::decode #3701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opencv-pushbot merged 2 commits into from
Mar 22, 2024
Merged

4.x: Fix data corruption in WeChatQRCode::impl::decode #3701

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35f0b6e
Fix data corruption in WeChatQRCode::impl::decode
ylatkin Mar 20, 2024
db093af
Add `const` qualifier to `candidate_points` at WeChatQRCode::impl::de…
ylatkin Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions modules/wechat_qrcode/src/wechat_qrcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class WeChatQRCode::Impl {
* @param points succussfully decoded qrcode with bounding box points.
* @return vector<string>
*/
std::vector<std::string> decode(const Mat& img, std::vector<Mat>& candidate_points,
std::vector<std::string> decode(const Mat& img,
const std::vector<Mat>& candidate_points,
std::vector<Mat>& points);
int applyDetector(const Mat& img, std::vector<Mat>& points);
Mat cropObj(const Mat& img, const Mat& point, Align& aligner);
Expand Down Expand Up @@ -123,13 +124,14 @@ float WeChatQRCode::getScaleFactor() {
return p->scaleFactor;
};

vector<string> WeChatQRCode::Impl::decode(const Mat& img, vector<Mat>& candidate_points,
vector<string> WeChatQRCode::Impl::decode(const Mat& img,
const vector<Mat>& candidate_points,
vector<Mat>& points) {
if (candidate_points.size() == 0) {
return vector<string>();
}
vector<string> decode_results;
for (auto& point : candidate_points) {
for (const auto& point : candidate_points) {
Mat cropped_img;
Align aligner;
if (use_nn_detector_) {
Expand All @@ -155,9 +157,11 @@ vector<string> WeChatQRCode::Impl::decode(const Mat& img, vector<Mat>& candidate

if (use_nn_detector_)
points_qr = aligner.warpBack(points_qr);

auto point_to_save = Mat(4, 2, CV_32FC1);
for (int j = 0; j < 4; ++j) {
point.at<float>(j, 0) = points_qr[j].x;
point.at<float>(j, 1) = points_qr[j].y;
point_to_save.at<float>(j, 0) = points_qr[j].x;
point_to_save.at<float>(j, 1) = points_qr[j].y;
}
// try to find duplicate qr corners
bool isDuplicate = false;
Expand All @@ -175,7 +179,7 @@ vector<string> WeChatQRCode::Impl::decode(const Mat& img, vector<Mat>& candidate
}
}
if (isDuplicate == false) {
points.push_back(point);
points.push_back(point_to_save);
check_points.push_back(points_qr);
}
else {
Expand Down Expand Up @@ -244,4 +248,4 @@ vector<float> WeChatQRCode::Impl::getScaleList(const int width, const int height
return {0.5, 1.0};
}
} // namespace wechat_qrcode
} // namespace cv
} // namespace cv