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, 23 insertions, 23 deletions

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index b7a0a1c3a7..53a5e487a4 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -29,7 +29,7 @@ CBC_QRCoderBitVector::CBC_QRCoderBitVector()
 }

 void CBC_QRCoderBitVector::Init()

 {

-    m_array = FX_Alloc(FX_BYTE, m_size);

+    m_array = FX_Alloc(uint8_t, m_size);

 }

 CBC_QRCoderBitVector::~CBC_QRCoderBitVector()

 {

@@ -47,32 +47,32 @@ void CBC_QRCoderBitVector::Clear()
     }

     m_sizeInBits = 0;

     m_size = 32;

-    m_array = FX_Alloc(FX_BYTE, m_size);

+    m_array = FX_Alloc(uint8_t, m_size);

 }

-FX_INT32 CBC_QRCoderBitVector::At(FX_INT32 index, FX_INT32 &e)

+int32_t CBC_QRCoderBitVector::At(int32_t index, int32_t &e)

 {

     if(index < 0 || index >= m_sizeInBits) {

         e = BCExceptionBadIndexException;

         BC_EXCEPTION_CHECK_ReturnValue(e, 0);

     }

-    FX_INT32 value = m_array[index >> 3] & 0xff;

+    int32_t value = m_array[index >> 3] & 0xff;

     return (value >> (7 - (index & 0x7))) & 1;

 }

-FX_INT32 CBC_QRCoderBitVector::sizeInBytes()

+int32_t CBC_QRCoderBitVector::sizeInBytes()

 {

     return (m_sizeInBits + 7) >> 3;

 }

-FX_INT32 CBC_QRCoderBitVector::Size()

+int32_t CBC_QRCoderBitVector::Size()

 {

     return m_sizeInBits;

 }

-void CBC_QRCoderBitVector::AppendBit(FX_INT32 bit, FX_INT32 &e)

+void CBC_QRCoderBitVector::AppendBit(int32_t bit, int32_t &e)

 {

     if(!(bit == 0 || bit == 1)) {

         e = BCExceptionBadValueException;

         BC_EXCEPTION_CHECK_ReturnVoid(e);

     }

-    FX_INT32 numBitsInLastByte = m_sizeInBits & 0x7;

+    int32_t numBitsInLastByte = m_sizeInBits & 0x7;

     if(numBitsInLastByte == 0) {

         AppendByte(0);

         m_sizeInBits -= 8;

@@ -80,55 +80,55 @@ void CBC_QRCoderBitVector::AppendBit(FX_INT32 bit, FX_INT32 &e)
     m_array[m_sizeInBits >> 3] |= (bit << (7 - numBitsInLastByte));

     ++m_sizeInBits;

 }

-void CBC_QRCoderBitVector::AppendBits(FX_INT32 value, FX_INT32 numBits, FX_INT32 &e)

+void CBC_QRCoderBitVector::AppendBits(int32_t value, int32_t numBits, int32_t &e)

 {

     if (numBits < 0 || numBits > 32) {

         e = BCExceptionBadNumBitsException;

         BC_EXCEPTION_CHECK_ReturnVoid(e);

     }

-    FX_INT32 numBitsLeft = numBits;

+    int32_t numBitsLeft = numBits;

     while (numBitsLeft > 0) {

         if ((m_sizeInBits & 0x7) == 0 && numBitsLeft >= 8) {

-            FX_INT32 newByte = (value >> (numBitsLeft - 8)) & 0xff;

+            int32_t newByte = (value >> (numBitsLeft - 8)) & 0xff;

             AppendByte(newByte);

             numBitsLeft -= 8;

         } else {

-            FX_INT32 bit = (value >> (numBitsLeft - 1)) & 1;

+            int32_t bit = (value >> (numBitsLeft - 1)) & 1;

             AppendBit(bit, e);

             BC_EXCEPTION_CHECK_ReturnVoid(e);

             --numBitsLeft;

         }

     }

 }

-void CBC_QRCoderBitVector::AppendBitVector(CBC_QRCoderBitVector *bits, FX_INT32 &e)

+void CBC_QRCoderBitVector::AppendBitVector(CBC_QRCoderBitVector *bits, int32_t &e)

 {

-    FX_INT32 size = bits->Size();

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

-        FX_INT32 num = bits->At(i, e);

+    int32_t size = bits->Size();

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

+        int32_t num = bits->At(i, e);

         BC_EXCEPTION_CHECK_ReturnVoid(e);

         AppendBit(num, e);

         BC_EXCEPTION_CHECK_ReturnVoid(e)

     }

 }

-void CBC_QRCoderBitVector::XOR(CBC_QRCoderBitVector *other, FX_INT32 &e)

+void CBC_QRCoderBitVector::XOR(CBC_QRCoderBitVector *other, int32_t &e)

 {

     if(m_sizeInBits != other->Size()) {

         e = BCExceptioncanNotOperatexorOperator;

         BC_EXCEPTION_CHECK_ReturnVoid(e);

     }

-    FX_INT32 sizeInBytes = (m_sizeInBits + 7) >> 3;

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

+    int32_t sizeInBytes = (m_sizeInBits + 7) >> 3;

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

         m_array[i] ^= (other->GetArray())[i];

     }

 }

-FX_BYTE* CBC_QRCoderBitVector::GetArray()

+uint8_t* CBC_QRCoderBitVector::GetArray()

 {

     return m_array;

 }

-void CBC_QRCoderBitVector::AppendByte(FX_INT32 value)

+void CBC_QRCoderBitVector::AppendByte(int32_t value)

 {

     if((m_sizeInBits >> 3) == m_size) {

-        FX_BYTE* newArray = FX_Alloc(FX_BYTE, m_size << 1);

+        uint8_t* newArray = FX_Alloc(uint8_t, m_size << 1);

         FXSYS_memcpy32(newArray, m_array, m_size);

         if(m_array != NULL) {

             FX_Free(m_array);

@@ -136,6 +136,6 @@ void CBC_QRCoderBitVector::AppendByte(FX_INT32 value)
         m_array = newArray;

         m_size = m_size << 1;

     }

-    m_array[m_sizeInBits >> 3] = (FX_BYTE) value;

+    m_array[m_sizeInBits >> 3] = (uint8_t) value;

     m_sizeInBits += 8;

 }