From d0070f46f8bff00b38c445b19a253e1ae43ca024 Mon Sep 17 00:00:00 2001 From: channings Date: Thu, 10 Jun 2021 14:36:03 +0800 Subject: [PATCH 1/2] Update unicomblock.hpp modify data type of m_iNowIdx --- modules/wechat_qrcode/src/zxing/common/unicomblock.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/wechat_qrcode/src/zxing/common/unicomblock.hpp b/modules/wechat_qrcode/src/zxing/common/unicomblock.hpp index 9b6871b2f44..28eedbdd287 100644 --- a/modules/wechat_qrcode/src/zxing/common/unicomblock.hpp +++ b/modules/wechat_qrcode/src/zxing/common/unicomblock.hpp @@ -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 m_vcIndex; - std::vector m_vcCount; + std::vector m_vcIndex; + std::vector m_vcCount; std::vector m_vcMinPnt; std::vector m_vcMaxPnt; std::vector m_vcQueue; From 2959e249827abf07694964ab53240d078d17614f Mon Sep 17 00:00:00 2001 From: channings Date: Thu, 10 Jun 2021 14:36:23 +0800 Subject: [PATCH 2/2] Update unicomblock.cpp --- modules/wechat_qrcode/src/zxing/common/unicomblock.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/wechat_qrcode/src/zxing/common/unicomblock.cpp b/modules/wechat_qrcode/src/zxing/common/unicomblock.cpp index 5c10a2d0e38..652458e91c8 100644 --- a/modules/wechat_qrcode/src/zxing/common/unicomblock.cpp +++ b/modules/wechat_qrcode/src/zxing/common/unicomblock.cpp @@ -16,8 +16,8 @@ UnicomBlock::~UnicomBlock() {} void UnicomBlock::Init() { if (m_bInit) return; - m_vcIndex = std::vector(m_iHeight * m_iWidth, 0); - m_vcCount = std::vector(m_iHeight * m_iWidth, 0); + m_vcIndex = std::vector(m_iHeight * m_iWidth, 0); + m_vcCount = std::vector(m_iHeight * m_iWidth, 0); m_vcMinPnt = std::vector(m_iHeight * m_iWidth, 0); m_vcMaxPnt = std::vector(m_iHeight * m_iWidth, 0); m_vcQueue = std::vector(m_iHeight * m_iWidth, 0);