Skip to content

Fix data type error #2971

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

Closed
wants to merge 2 commits into from
Closed

Fix data type error #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0070f4
Update unicomblock.hpp
Channingss Jun 10, 2021
2959e24
Update unicomblock.cpp
Channingss Jun 10, 2021
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
4 changes: 2 additions & 2 deletions modules/wechat_qrcode/src/zxing/common/unicomblock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ UnicomBlock::~UnicomBlock() {}

void UnicomBlock::Init() {
if (m_bInit) return;
m_vcIndex = std::vector<unsigned short>(m_iHeight * m_iWidth, 0);
m_vcCount = std::vector<unsigned short>(m_iHeight * m_iWidth, 0);
m_vcIndex = std::vector<unsigned int>(m_iHeight * m_iWidth, 0);
m_vcCount = std::vector<unsigned int>(m_iHeight * m_iWidth, 0);
m_vcMinPnt = std::vector<int>(m_iHeight * m_iWidth, 0);
m_vcMaxPnt = std::vector<int>(m_iHeight * m_iWidth, 0);
m_vcQueue = std::vector<int>(m_iHeight * m_iWidth, 0);
Expand Down
6 changes: 3 additions & 3 deletions modules/wechat_qrcode/src/zxing/common/unicomblock.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ class UnicomBlock : public Counted {
int m_iHeight;
int m_iWidth;

unsigned short m_iNowIdx;
unsigned int m_iNowIdx;
bool m_bInit;
std::vector<unsigned short> m_vcIndex;
std::vector<unsigned short> m_vcCount;
std::vector<unsigned int> m_vcIndex;
std::vector<unsigned int> m_vcCount;
std::vector<int> m_vcMinPnt;
std::vector<int> m_vcMaxPnt;
std::vector<int> m_vcQueue;
Expand Down