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

xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp

Index: xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
index 1a4e59864e7d07ecf8f37169e02e8354c28583bc..bbbf4bdee5b2c545f90f4521888dc49b76a9965c 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
@@ -29,17 +29,17 @@ void CBC_DataMatrixVersion::Initialize()
 }
 void CBC_DataMatrixVersion::Finalize()
 {
-    for (FX_INT32 i = 0; i < VERSIONS->GetSize(); i++) {
+    for (int32_t i = 0; i < VERSIONS->GetSize(); i++) {
         delete ( (CBC_DataMatrixVersion*)(VERSIONS->GetAt(i)) );
     }
     VERSIONS->RemoveAll();
     delete VERSIONS;
 }
-CBC_DataMatrixVersion::CBC_DataMatrixVersion(FX_INT32 versionNumber,
-        FX_INT32 symbolSizeRows,
-        FX_INT32 symbolSizeColumns,
-        FX_INT32 dataRegionSizeRows,
-        FX_INT32 dataRegionSizeColumns,
+CBC_DataMatrixVersion::CBC_DataMatrixVersion(int32_t versionNumber,
+        int32_t symbolSizeRows,
+        int32_t symbolSizeColumns,
+        int32_t dataRegionSizeRows,
+        int32_t dataRegionSizeColumns,
         ECBlocks *ecBlocks)
 {
     m_versionNumber = versionNumber;
@@ -48,10 +48,10 @@ CBC_DataMatrixVersion::CBC_DataMatrixVersion(FX_INT32 versionNumber,
     m_dataRegionSizeRows = dataRegionSizeRows;
     m_dataRegionSizeColumns = dataRegionSizeColumns;
     m_ecBlocks = ecBlocks;
-    FX_INT32 total = 0;
-    FX_INT32 ecCodewords = ecBlocks->GetECCodewords();
+    int32_t total = 0;
+    int32_t ecCodewords = ecBlocks->GetECCodewords();
     const CFX_PtrArray &ecbArray = ecBlocks->GetECBlocks();
-    for (FX_INT32 i = 0; i < ecbArray.GetSize(); i++) {
+    for (int32_t i = 0; i < ecbArray.GetSize(); i++) {
         total += ((ECB*)ecbArray[i])->GetCount() * (((ECB*)ecbArray[i])->GetDataCodewords() + ecCodewords);
     }
     m_totalCodewords = total;
@@ -63,27 +63,27 @@ CBC_DataMatrixVersion::~CBC_DataMatrixVersion()
     }
     m_ecBlocks = NULL;
 }
-FX_INT32 CBC_DataMatrixVersion::GetVersionNumber()
+int32_t CBC_DataMatrixVersion::GetVersionNumber()
 {
     return m_versionNumber;
 }
-FX_INT32 CBC_DataMatrixVersion::GetSymbolSizeRows()
+int32_t CBC_DataMatrixVersion::GetSymbolSizeRows()
 {
     return m_symbolSizeRows;
 }
-FX_INT32 CBC_DataMatrixVersion::GetSymbolSizeColumns()
+int32_t CBC_DataMatrixVersion::GetSymbolSizeColumns()
 {
     return m_symbolSizeColumns;
 }
-FX_INT32 CBC_DataMatrixVersion::GetDataRegionSizeRows()
+int32_t CBC_DataMatrixVersion::GetDataRegionSizeRows()
 {
     return m_dataRegionSizeRows;
 }
-FX_INT32 CBC_DataMatrixVersion::GetDataRegionSizeColumns()
+int32_t CBC_DataMatrixVersion::GetDataRegionSizeColumns()
 {
     return m_dataRegionSizeColumns;
 }
-FX_INT32 CBC_DataMatrixVersion::GetTotalCodewords()
+int32_t CBC_DataMatrixVersion::GetTotalCodewords()
 {
     return m_totalCodewords;
 }
@@ -93,12 +93,12 @@ ECBlocks *CBC_DataMatrixVersion::GetECBlocks()
 }
 void CBC_DataMatrixVersion::ReleaseAll()
 {
-    for (FX_INT32 i = 0; i < VERSIONS->GetSize(); i++) {
+    for (int32_t i = 0; i < VERSIONS->GetSize(); i++) {
         delete (CBC_DataMatrixVersion*)VERSIONS->GetAt(i);
     }
     VERSIONS->RemoveAll();
 }
-CBC_DataMatrixVersion *CBC_DataMatrixVersion::GetVersionForDimensions(FX_INT32 numRows, FX_INT32 numColumns, FX_INT32 &e)
+CBC_DataMatrixVersion *CBC_DataMatrixVersion::GetVersionForDimensions(int32_t numRows, int32_t numColumns, int32_t &e)
 {
     if ((numRows & 0x01) != 0 || (numColumns & 0x01) != 0) {
         e = BCExceptionNotFound;
@@ -136,8 +136,8 @@ CBC_DataMatrixVersion *CBC_DataMatrixVersion::GetVersionForDimensions(FX_INT32 n
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(29, 16, 36, 14, 16, FX_NEW ECBlocks(24, FX_NEW ECB(1, 32))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(30, 16, 48, 14, 22, FX_NEW ECBlocks(28, FX_NEW ECB(1, 49))));
     }
-    FX_INT32 numVersions = VERSIONS->GetSize();
-    for (FX_INT32 i = 0; i < numVersions; ++i) {
+    int32_t numVersions = VERSIONS->GetSize();
+    for (int32_t i = 0; i < numVersions; ++i) {
         if (((CBC_DataMatrixVersion*)((*VERSIONS)[i]))->m_symbolSizeRows == numRows && ((CBC_DataMatrixVersion*)((*VERSIONS)[i]))->m_symbolSizeColumns == numColumns) {
             return (CBC_DataMatrixVersion*)(*VERSIONS)[i];
         }