| Index: xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
|
| diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
|
| index 4c97bc3f242904d6fd66b665163096ed24383e19..20831b4ad8ceb3f55d7084cad583ea1e59791e2c 100644
|
| --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
|
| +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
|
| @@ -15,7 +15,7 @@ public:
|
| virtual ~CBC_DecodedBitStreamPaser();
|
| static void Initialize();
|
| static void Finalize();
|
| - static CBC_CommonDecoderResult* decode(CFX_Int32Array &codewords, CFX_ByteString ecLevel, FX_INT32 &e);
|
| + static CBC_CommonDecoderResult* decode(CFX_Int32Array &codewords, CFX_ByteString ecLevel, int32_t &e);
|
|
|
| private:
|
| enum Mode {
|
| @@ -26,22 +26,22 @@ private:
|
| ALPHA_SHIFT,
|
| PUNCT_SHIFT
|
| };
|
| - static FX_INT32 MAX_NUMERIC_CODEWORDS;
|
| - static FX_INT32 PL;
|
| - static FX_INT32 LL;
|
| - static FX_INT32 AS;
|
| - static FX_INT32 ML;
|
| - static FX_INT32 AL;
|
| - static FX_INT32 PS;
|
| - static FX_INT32 PAL;
|
| + static int32_t MAX_NUMERIC_CODEWORDS;
|
| + static int32_t PL;
|
| + static int32_t LL;
|
| + static int32_t AS;
|
| + static int32_t ML;
|
| + static int32_t AL;
|
| + static int32_t PS;
|
| + static int32_t PAL;
|
| static FX_CHAR PUNCT_CHARS[29];
|
| static FX_CHAR MIXED_CHARS[30];
|
| - static FX_INT32 NUMBER_OF_SEQUENCE_CODEWORDS;
|
| - static FX_INT32 decodeMacroBlock(CFX_Int32Array &codewords, FX_INT32 codeIndex, CBC_PDF417ResultMetadata* resultMetadata, FX_INT32 &e);
|
| - static FX_INT32 textCompaction(CFX_Int32Array &codewords, FX_INT32 codeIndex, CFX_ByteString &result);
|
| - static void decodeTextCompaction(CFX_Int32Array &textCompactionData, CFX_Int32Array &byteCompactionData, FX_INT32 length, CFX_ByteString &result);
|
| - static FX_INT32 byteCompaction(FX_INT32 mode, CFX_Int32Array &codewords, FX_INT32 codeIndex, CFX_ByteString &result);
|
| - static FX_INT32 numericCompaction(CFX_Int32Array &codewords, FX_INT32 codeIndex, CFX_ByteString &result, FX_INT32 &e);
|
| - static CFX_ByteString decodeBase900toBase10(CFX_Int32Array &codewords, FX_INT32 count, FX_INT32 &e);
|
| + static int32_t NUMBER_OF_SEQUENCE_CODEWORDS;
|
| + static int32_t decodeMacroBlock(CFX_Int32Array &codewords, int32_t codeIndex, CBC_PDF417ResultMetadata* resultMetadata, int32_t &e);
|
| + static int32_t textCompaction(CFX_Int32Array &codewords, int32_t codeIndex, CFX_ByteString &result);
|
| + static void decodeTextCompaction(CFX_Int32Array &textCompactionData, CFX_Int32Array &byteCompactionData, int32_t length, CFX_ByteString &result);
|
| + static int32_t byteCompaction(int32_t mode, CFX_Int32Array &codewords, int32_t codeIndex, CFX_ByteString &result);
|
| + static int32_t numericCompaction(CFX_Int32Array &codewords, int32_t codeIndex, CFX_ByteString &result, int32_t &e);
|
| + static CFX_ByteString decodeBase900toBase10(CFX_Int32Array &codewords, int32_t count, int32_t &e);
|
| };
|
| #endif
|
|
|