From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 9 Jun 2015 13:24:12 -0700
Subject: 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
---
 xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp')

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
index 02bc0f5574..8918d32600 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
@@ -22,7 +22,7 @@
 
 #include "../barcode.h"
 #include "BC_PDF417BarcodeRow.h"
-CBC_BarcodeRow::CBC_BarcodeRow(FX_INT32 width)
+CBC_BarcodeRow::CBC_BarcodeRow(int32_t width)
 {
     m_row.SetSize(width);
     m_currentLocation = 0;
@@ -32,17 +32,17 @@ CBC_BarcodeRow::~CBC_BarcodeRow()
     m_output.RemoveAll();
     m_row.RemoveAll();
 }
-void CBC_BarcodeRow::set(FX_INT32 x, FX_BYTE value)
+void CBC_BarcodeRow::set(int32_t x, uint8_t value)
 {
     m_row.SetAt(x, value);
 }
-void CBC_BarcodeRow::set(FX_INT32 x, FX_BOOL black)
+void CBC_BarcodeRow::set(int32_t x, FX_BOOL black)
 {
-    m_row.SetAt(x, (FX_BYTE) (black ? 1 : 0));
+    m_row.SetAt(x, (uint8_t) (black ? 1 : 0));
 }
-void CBC_BarcodeRow::addBar(FX_BOOL black, FX_INT32 width)
+void CBC_BarcodeRow::addBar(FX_BOOL black, int32_t width)
 {
-    for (FX_INT32 ii = 0; ii < width; ii++) {
+    for (int32_t ii = 0; ii < width; ii++) {
         set(m_currentLocation++, black);
     }
 }
@@ -50,10 +50,10 @@ CFX_ByteArray& CBC_BarcodeRow::getRow()
 {
     return m_row;
 }
-CFX_ByteArray& CBC_BarcodeRow::getScaledRow(FX_INT32 scale)
+CFX_ByteArray& CBC_BarcodeRow::getScaledRow(int32_t scale)
 {
     m_output.SetSize(m_row.GetSize() * scale);
-    for (FX_INT32 i = 0; i < m_output.GetSize(); i++) {
+    for (int32_t i = 0; i < m_output.GetSize(); i++) {
         m_output[i] = (m_row[i / scale]);
     }
     return m_output;
-- 
cgit v1.2.3