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

Near-automatic merge, plus re-running scripts to update
additional usage.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1172793002

1 files changed, 15 insertions, 15 deletions

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index e45562ba79..aa30e25d49 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -23,10 +23,10 @@
 #include "../barcode.h"

 #include "BC_PDF417BarcodeRow.h"

 #include "BC_PDF417BarcodeMatrix.h"

-CBC_BarcodeMatrix::CBC_BarcodeMatrix(FX_INT32 height, FX_INT32 width)

+CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width)

 {

     m_matrix.SetSize(height + 2);

-    for (FX_INT32 i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength; i++) {

+    for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength; i++) {

         m_matrix[i] = FX_NEW CBC_BarcodeRow((width + 4) * 17 + 1);

     }

     m_width = width * 17;

@@ -37,19 +37,19 @@ CBC_BarcodeMatrix::CBC_BarcodeMatrix(FX_INT32 height, FX_INT32 width)
 }

 CBC_BarcodeMatrix::~CBC_BarcodeMatrix()

 {

-    for (FX_INT32 i = 0; i < m_matrix.GetSize(); i++) {

+    for (int32_t i = 0; i < m_matrix.GetSize(); i++) {

         delete (CBC_BarcodeRow*)m_matrix.GetAt(i);

     }

     m_matrix.RemoveAll();

     m_matrixOut.RemoveAll();

 }

-void CBC_BarcodeMatrix::set(FX_INT32 x, FX_INT32 y, FX_BYTE value)

+void CBC_BarcodeMatrix::set(int32_t x, int32_t y, uint8_t value)

 {

     ((CBC_BarcodeRow*)m_matrix[y])->set(x, value);

 }

-void CBC_BarcodeMatrix::setMatrix(FX_INT32 x, FX_INT32 y, FX_BOOL black)

+void CBC_BarcodeMatrix::setMatrix(int32_t x, int32_t y, FX_BOOL black)

 {

-    set(x, y, (FX_BYTE) (black ? 1 : 0));

+    set(x, y, (uint8_t) (black ? 1 : 0));

 }

 void CBC_BarcodeMatrix::startRow()

 {

@@ -59,11 +59,11 @@ CBC_BarcodeRow* CBC_BarcodeMatrix::getCurrentRow()
 {

     return (CBC_BarcodeRow*)m_matrix[m_currentRow];

 }

-FX_INT32 CBC_BarcodeMatrix::getWidth()

+int32_t CBC_BarcodeMatrix::getWidth()

 {

     return m_outWidth;

 }

-FX_INT32 CBC_BarcodeMatrix::getHeight()

+int32_t CBC_BarcodeMatrix::getHeight()

 {

     return m_outHeight;

 }

@@ -71,26 +71,26 @@ CFX_ByteArray& CBC_BarcodeMatrix::getMatrix()
 {

     return getScaledMatrix(1, 1);

 }

-CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(FX_INT32 scale)

+CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(int32_t scale)

 {

     return getScaledMatrix(scale, scale);

 }

-CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(FX_INT32 xScale, FX_INT32 yScale)

+CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(int32_t xScale, int32_t yScale)

 {

-    FX_INT32 yMax = m_height * yScale;

+    int32_t yMax = m_height * yScale;

     CFX_ByteArray bytearray;

     bytearray.Copy(((CBC_BarcodeRow*)m_matrix[0])->getScaledRow(xScale));

-    FX_INT32 xMax = bytearray.GetSize();

+    int32_t xMax = bytearray.GetSize();

     m_matrixOut.SetSize(xMax * yMax);

     m_outWidth = xMax;

     m_outHeight = yMax;

-    FX_INT32 k = 0;

-    for (FX_INT32 i = 0; i < yMax; i++) {

+    int32_t k = 0;

+    for (int32_t i = 0; i < yMax; i++) {

         if (i != 0) {

             bytearray.Copy(((CBC_BarcodeRow*)m_matrix[i / yScale])->getScaledRow(xScale));

         }

         k = i * xMax;

-        for (FX_INT32 l = 0; l < xMax; l++) {

+        for (int32_t l = 0; l < xMax; l++) {

             m_matrixOut[k + l] = bytearray.GetAt(l);

         }

     }