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

xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp

Index: xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index 27c8615bf9c40d162e6a2ec3cec68d6450e74d62..da4741d11a23428ec623fbc1b8e9beb2314d7b85 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -22,7 +22,7 @@
 
 #include "../barcode.h"
 #include "BC_CommonByteMatrix.h"
-CBC_CommonByteMatrix::CBC_CommonByteMatrix(FX_INT32 width, FX_INT32 height)
+CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height)
 {
     m_height = height;
     m_width = width;
@@ -30,7 +30,7 @@ CBC_CommonByteMatrix::CBC_CommonByteMatrix(FX_INT32 width, FX_INT32 height)
 }
 void CBC_CommonByteMatrix::Init()
 {
-    m_bytes = FX_Alloc(FX_BYTE, m_height * m_width);
+    m_bytes = FX_Alloc(uint8_t, m_height * m_width);
     FXSYS_memset8(m_bytes, 0xff, m_height * m_width);
 }
 CBC_CommonByteMatrix::~CBC_CommonByteMatrix()
@@ -40,37 +40,37 @@ CBC_CommonByteMatrix::~CBC_CommonByteMatrix()
         m_bytes = NULL;
     }
 }
-FX_INT32 CBC_CommonByteMatrix::GetHeight()
+int32_t CBC_CommonByteMatrix::GetHeight()
 {
     return m_height;
 }
-FX_INT32 CBC_CommonByteMatrix::GetWidth()
+int32_t CBC_CommonByteMatrix::GetWidth()
 {
     return m_width;
 }
-FX_BYTE CBC_CommonByteMatrix::Get(FX_INT32 x, FX_INT32 y)
+uint8_t CBC_CommonByteMatrix::Get(int32_t x, int32_t y)
 {
     return m_bytes[y * m_width + x];
 }
-void CBC_CommonByteMatrix::Set(FX_INT32 x, FX_INT32 y, FX_INT32 value)
+void CBC_CommonByteMatrix::Set(int32_t x, int32_t y, int32_t value)
 {
-    m_bytes[y * m_width + x] = (FX_BYTE)value;
+    m_bytes[y * m_width + x] = (uint8_t)value;
 }
-void CBC_CommonByteMatrix::Set(FX_INT32 x, FX_INT32 y, FX_BYTE value)
+void CBC_CommonByteMatrix::Set(int32_t x, int32_t y, uint8_t value)
 {
     m_bytes[y * m_width + x] = value;
 }
-void CBC_CommonByteMatrix::clear(FX_BYTE value)
+void CBC_CommonByteMatrix::clear(uint8_t value)
 {
-    FX_INT32 y;
+    int32_t y;
     for(y = 0; y < m_height; y++) {
-        FX_INT32 x;
+        int32_t x;
         for(x = 0; x < m_width; x++) {
             m_bytes[y * m_width + x] = value;
         }
     }
 }
-FX_BYTE* CBC_CommonByteMatrix::GetArray()
+uint8_t* CBC_CommonByteMatrix::GetArray()
 {
     return m_bytes;
 }