summaryrefslogtreecommitdiff
path: root/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-03-21 15:00:20 -0700
committerTom Sepez <tsepez@chromium.org>2016-03-21 15:00:20 -0700
commit62a70f90c49cf7714c960186eb063ad55333e6f3 (patch)
tree84b5d0f70b770e6a9ec261342d46638f4d5102bd /xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
parent4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff)
downloadpdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp')
-rw-r--r--xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index d52648c683..04246bd5d8 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -361,7 +361,7 @@ int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
if (mode == BYTE_COMPACTION_MODE_LATCH) {
int32_t count = 0;
int64_t value = 0;
- FX_WORD* decodedData = FX_Alloc(FX_WORD, 6);
+ uint16_t* decodedData = FX_Alloc(uint16_t, 6);
CFX_Int32Array byteCompactedCodewords;
byteCompactedCodewords.SetSize(6);
FX_BOOL end = FALSE;
@@ -383,7 +383,7 @@ int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
if ((count % 5 == 0) && (count > 0)) {
int32_t j = 0;
for (; j < 6; ++j) {
- decodedData[5 - j] = (FX_WORD)(value % 256);
+ decodedData[5 - j] = (uint16_t)(value % 256);
value >>= 8;
}
for (j = 0; j < 6; ++j) {
@@ -398,7 +398,7 @@ int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
byteCompactedCodewords[count++] = nextCode;
}
for (int32_t i = 0; i < count; i++) {
- result += (FX_CHAR)(FX_WORD)byteCompactedCodewords[i];
+ result += (FX_CHAR)(uint16_t)byteCompactedCodewords[i];
}
} else if (mode == BYTE_COMPACTION_MODE_LATCH_6) {
int32_t count = 0;
@@ -422,10 +422,10 @@ int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
}
}
if ((count % 5 == 0) && (count > 0)) {
- FX_WORD* decodedData = FX_Alloc(FX_WORD, 6);
+ uint16_t* decodedData = FX_Alloc(uint16_t, 6);
int32_t j = 0;
for (; j < 6; ++j) {
- decodedData[5 - j] = (FX_WORD)(value & 0xFF);
+ decodedData[5 - j] = (uint16_t)(value & 0xFF);
value >>= 8;
}
for (j = 0; j < 6; ++j) {