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

xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 // Original code is licensed as follows:
 /*
  * Copyright 2007 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ skipping 11 matching lines @@
 
 #include "../barcode.h"
 #include "BC_DataMatrixVersion.h"
 CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL;
 void CBC_DataMatrixVersion::Initialize()
 {
     VERSIONS = FX_NEW CFX_PtrArray();
 }
 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;
     m_symbolSizeRows = symbolSizeRows;
     m_symbolSizeColumns = symbolSizeColumns;
     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;
 }
 CBC_DataMatrixVersion::~CBC_DataMatrixVersion()
 {
     if(m_ecBlocks != NULL) {
         delete m_ecBlocks;
     }
     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;
 }
 ECBlocks *CBC_DataMatrixVersion::GetECBlocks()
 {
     return m_ecBlocks;
 }
 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;
         return NULL;
     }
     if(VERSIONS->GetSize() == 0) {
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(1, 10, 10, 8, 8, FX_NEW ECBlocks(5, FX_NEW ECB(1, 3))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(2, 12, 12, 10, 10, FX_NEW ECBlocks(7, FX_NEW ECB(1, 5))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(3, 14, 14, 12, 12, FX_NEW ECBlocks(10, FX_NEW ECB(1, 8))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(4, 16, 16, 14, 14, FX_NEW ECBlocks(12, FX_NEW ECB(1, 12))));
@@ skipping 17 matching lines @@
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(22, 120, 120, 18, 18, FX_NEW ECBlocks(68, FX_NEW ECB(6, 175))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(23, 132, 132, 20, 20, FX_NEW ECBlocks(62, FX_NEW ECB(8, 163))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(24, 144, 144, 22, 22, FX_NEW ECBlocks(62, FX_NEW ECB(8, 156), FX_NEW ECB(2, 155))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(25, 8, 18, 6, 16, FX_NEW ECBlocks(7, FX_NEW ECB(1, 5))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(26, 8, 32, 6, 14, FX_NEW ECBlocks(11, FX_NEW ECB(1, 10))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(27, 12, 26, 10, 24, FX_NEW ECBlocks(14, FX_NEW ECB(1, 16))));
         VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(28, 12, 36, 10, 16, FX_NEW ECBlocks(18, FX_NEW ECB(1, 22))));
         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];
         }
     }
     e = BCExceptionNotFound;
     return NULL;
 }