summaryrefslogtreecommitdiff
path: root/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
commitbfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch)
tree4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
parentb116136da234afcad018bb44a3ccb64b9ad2a554 (diff)
downloadpdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz
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
Diffstat (limited to 'xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp')
-rw-r--r--xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index 27c8615bf9..da4741d11a 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;
}