diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-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/pdf417/BC_PDF417DetectionResultColumn.cpp')
| -rw-r--r-- | xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index 6d949b7640..f4da542130 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -24,7 +24,7 @@ #include "BC_PDF417Codeword.h"
#include "BC_PDF417BoundingBox.h"
#include "BC_PDF417DetectionResultColumn.h"
-FX_INT32 CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5;
+int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5;
CBC_DetectionResultColumn::CBC_DetectionResultColumn(CBC_BoundingBox* boundingBox)
{
m_boundingBox = boundingBox;
@@ -33,20 +33,20 @@ CBC_DetectionResultColumn::CBC_DetectionResultColumn(CBC_BoundingBox* boundingBo }
CBC_DetectionResultColumn::~CBC_DetectionResultColumn()
{
- for (FX_INT32 i = 0; i < m_codewords->GetSize(); i++) {
+ for (int32_t i = 0; i < m_codewords->GetSize(); i++) {
delete (CBC_Codeword*)m_codewords->GetAt(i);
}
m_codewords->RemoveAll();
delete m_codewords;
}
-CBC_Codeword* CBC_DetectionResultColumn::getCodewordNearby(FX_INT32 imageRow)
+CBC_Codeword* CBC_DetectionResultColumn::getCodewordNearby(int32_t imageRow)
{
CBC_Codeword* codeword = getCodeword(imageRow);
if (codeword != NULL) {
return codeword;
}
- for (FX_INT32 i = 1; i < MAX_NEARBY_DISTANCE; i++) {
- FX_INT32 nearImageRow = imageRowToCodewordIndex(imageRow) - i;
+ for (int32_t i = 1; i < MAX_NEARBY_DISTANCE; i++) {
+ int32_t nearImageRow = imageRowToCodewordIndex(imageRow) - i;
if (nearImageRow >= 0) {
codeword = (CBC_Codeword*)m_codewords->GetAt(nearImageRow);
if (codeword != NULL) {
@@ -63,19 +63,19 @@ CBC_Codeword* CBC_DetectionResultColumn::getCodewordNearby(FX_INT32 imageRow) }
return NULL;
}
-FX_INT32 CBC_DetectionResultColumn::imageRowToCodewordIndex(FX_INT32 imageRow)
+int32_t CBC_DetectionResultColumn::imageRowToCodewordIndex(int32_t imageRow)
{
return imageRow - m_boundingBox->getMinY();
}
-FX_INT32 CBC_DetectionResultColumn::codewordIndexToImageRow(FX_INT32 codewordIndex)
+int32_t CBC_DetectionResultColumn::codewordIndexToImageRow(int32_t codewordIndex)
{
return m_boundingBox->getMinY() + codewordIndex;
}
-void CBC_DetectionResultColumn::setCodeword(FX_INT32 imageRow, CBC_Codeword* codeword)
+void CBC_DetectionResultColumn::setCodeword(int32_t imageRow, CBC_Codeword* codeword)
{
m_codewords->SetAt(imageRowToCodewordIndex(imageRow), codeword);
}
-CBC_Codeword* CBC_DetectionResultColumn::getCodeword(FX_INT32 imageRow)
+CBC_Codeword* CBC_DetectionResultColumn::getCodeword(int32_t imageRow)
{
return (CBC_Codeword*)m_codewords->GetAt(imageRowToCodewordIndex(imageRow));
}
@@ -90,8 +90,8 @@ CFX_PtrArray* CBC_DetectionResultColumn::getCodewords() CFX_ByteString CBC_DetectionResultColumn::toString()
{
CFX_ByteString result;
- FX_INT32 row = 0;
- for (FX_INT32 i = 0; i < m_codewords->GetSize(); i++) {
+ int32_t row = 0;
+ for (int32_t i = 0; i < m_codewords->GetSize(); i++) {
CBC_Codeword* codeword = (CBC_Codeword*)m_codewords->GetAt(i);
if (codeword == NULL) {
result += (FX_CHAR) row;
|