Merge pull request #2972 from Channingss:date_type_fixer

Date type fixer

* Update unicomblock.hpp

modify data type of m_iNowIdx

* Update unicomblock.cpp

Author: Channingss

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<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);

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<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;