Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp

Index: xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
index 87c14deac9bf26dfd846ed192f42e7a2b1e4d1fd..2877d2f82b8e027f963de8665bd7c233f59547eb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
@@ -25,7 +25,7 @@
 #include "BC_QRCoderECB.h"
 #include "BC_QRDataBlock.h"
 #include "BC_QRCoderVersion.h"
-CBC_QRDataBlock::CBC_QRDataBlock(FX_INT32 numDataCodewords, CFX_ByteArray *codewords)
+CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords, CFX_ByteArray *codewords)
     : m_numDataCodewords(numDataCodewords)
     , m_codewords(codewords)
 {
@@ -37,7 +37,7 @@ CBC_QRDataBlock::~CBC_QRDataBlock()
         m_codewords = NULL;
     }
 }
-FX_INT32 CBC_QRDataBlock::GetNumDataCodewords()
+int32_t CBC_QRDataBlock::GetNumDataCodewords()
 {
     return m_numDataCodewords;
 }
@@ -45,47 +45,47 @@ CFX_ByteArray *CBC_QRDataBlock::GetCodewords()
 {
     return m_codewords;
 }
-CFX_PtrArray *CBC_QRDataBlock::GetDataBlocks(CFX_ByteArray* rawCodewords, CBC_QRCoderVersion *version, CBC_QRCoderErrorCorrectionLevel* ecLevel, FX_INT32 &e)
+CFX_PtrArray *CBC_QRDataBlock::GetDataBlocks(CFX_ByteArray* rawCodewords, CBC_QRCoderVersion *version, CBC_QRCoderErrorCorrectionLevel* ecLevel, int32_t &e)
 {
     if(rawCodewords->GetSize() != version->GetTotalCodeWords()) {
         e = BCExceptionIllegalArgument;
         BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
     }
     CBC_QRCoderECBlocks *ecBlocks = version->GetECBlocksForLevel(ecLevel);
-    FX_INT32 totalBlocks = 0;
+    int32_t totalBlocks = 0;
     CFX_PtrArray* ecBlockArray = ecBlocks->GetECBlocks();
-    FX_INT32 i = 0;
+    int32_t i = 0;
     for(i = 0; i < ecBlockArray->GetSize(); i++) {
         totalBlocks += ((CBC_QRCoderECB*)(*ecBlockArray)[i])->GetCount();
     }
     CFX_PtrArray *datablock = FX_NEW CFX_PtrArray();
     datablock->SetSize(totalBlocks);
     CBC_AutoPtr<CFX_PtrArray > result(datablock);
-    FX_INT32 numResultBlocks = 0;
-    for(FX_INT32 j = 0; j < ecBlockArray->GetSize(); j++) {
+    int32_t numResultBlocks = 0;
+    for(int32_t j = 0; j < ecBlockArray->GetSize(); j++) {
         CBC_QRCoderECB *ecBlock = (CBC_QRCoderECB*)(*ecBlockArray)[j];
-        for(FX_INT32 k = 0; k < ecBlock->GetCount(); k++) {
-            FX_INT32 numDataCodewords = ecBlock->GetDataCodeWords();
-            FX_INT32 numBlockCodewords = ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords;
+        for(int32_t k = 0; k < ecBlock->GetCount(); k++) {
+            int32_t numDataCodewords = ecBlock->GetDataCodeWords();
+            int32_t numBlockCodewords = ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords;
             CFX_ByteArray *bytearray = FX_NEW CFX_ByteArray();
             bytearray->SetSize(numBlockCodewords);
             (*result)[numResultBlocks++] = FX_NEW CBC_QRDataBlock(numDataCodewords, bytearray);
         }
     }
-    FX_INT32 shorterBlocksTotalCodewords = ((CBC_QRDataBlock*)(*result)[0])->m_codewords->GetSize();
-    FX_INT32 longerBlocksStartAt = result->GetSize() - 1;
+    int32_t shorterBlocksTotalCodewords = ((CBC_QRDataBlock*)(*result)[0])->m_codewords->GetSize();
+    int32_t longerBlocksStartAt = result->GetSize() - 1;
     while(longerBlocksStartAt >= 0) {
-        FX_INT32 numCodewords = ((CBC_QRDataBlock*)(*result)[longerBlocksStartAt])->m_codewords->GetSize();
+        int32_t numCodewords = ((CBC_QRDataBlock*)(*result)[longerBlocksStartAt])->m_codewords->GetSize();
         if(numCodewords == shorterBlocksTotalCodewords) {
             break;
         }
         longerBlocksStartAt--;
     }
     longerBlocksStartAt++;
-    FX_INT32 shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks->GetECCodeWordsPerBlock();
-    FX_INT32 rawCodewordsOffset = 0;
-    FX_INT32 x = 0;
-    for(FX_INT32 k = 0; k < shorterBlocksNumDataCodewords; k++) {
+    int32_t shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks->GetECCodeWordsPerBlock();
+    int32_t rawCodewordsOffset = 0;
+    int32_t x = 0;
+    for(int32_t k = 0; k < shorterBlocksNumDataCodewords; k++) {
         for(x = 0; x < numResultBlocks; x++) {
             (*(((CBC_QRDataBlock*)(*result)[x])->m_codewords))[k] = (*rawCodewords)[rawCodewordsOffset++];
         }
@@ -93,10 +93,10 @@ CFX_PtrArray *CBC_QRDataBlock::GetDataBlocks(CFX_ByteArray* rawCodewords, CBC_QR
     for(x = longerBlocksStartAt; x < numResultBlocks; x++) {
         (*(((CBC_QRDataBlock*)(*result)[x])->m_codewords))[shorterBlocksNumDataCodewords] = (*rawCodewords)[rawCodewordsOffset++];
     }
-    FX_INT32 max = ((CBC_QRDataBlock*)(*result)[0])->m_codewords->GetSize();
+    int32_t max = ((CBC_QRDataBlock*)(*result)[0])->m_codewords->GetSize();
     for(i = shorterBlocksNumDataCodewords; i < max; i++) {
-        for(FX_INT32 y = 0; y < numResultBlocks; y++) {
-            FX_INT32 iOffset = y < longerBlocksStartAt ? i : i + 1;
+        for(int32_t y = 0; y < numResultBlocks; y++) {
+            int32_t iOffset = y < longerBlocksStartAt ? i : i + 1;
             (*(((CBC_QRDataBlock*)(*result)[y])->m_codewords))[iOffset] = (*rawCodewords)[rawCodewordsOffset++];
         }
     }