diff options
author | Lei Zhang <thestig@chromium.org> | 2017-04-27 23:58:03 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-28 19:12:30 +0000 |
commit | 60cd033adf6c469ff47bdaf85a66b5817fdd188b (patch) | |
tree | a91b3cee7aaeb0dc650fd857bfd3476da848eacf /fxbarcode/datamatrix/BC_HighLevelEncoder.cpp | |
parent | 7831f57f04ad3f581222b0a23eeb736601f98e96 (diff) | |
download | pdfium-60cd033adf6c469ff47bdaf85a66b5817fdd188b.tar.xz |
Remove dead dimensions code in fxbarcode.chromium/3084
Remove more exceptions.
Change-Id: I3b8b8b9837b0010b1e0060ddd56e93c78f9f0fb5
Reviewed-on: https://pdfium-review.googlesource.com/4410
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxbarcode/datamatrix/BC_HighLevelEncoder.cpp')
-rw-r--r-- | fxbarcode/datamatrix/BC_HighLevelEncoder.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index f9fb080be3..cc85c838a3 100644 --- a/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -20,11 +20,12 @@ * limitations under the License. */ +#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h" + #include <limits> #include <memory> #include <vector> -#include "fxbarcode/BC_Dimension.h" #include "fxbarcode/BC_UtilCodingConvert.h" #include "fxbarcode/common/BC_CommonBitMatrix.h" #include "fxbarcode/datamatrix/BC_ASCIIEncoder.h" @@ -33,7 +34,6 @@ #include "fxbarcode/datamatrix/BC_EdifactEncoder.h" #include "fxbarcode/datamatrix/BC_Encoder.h" #include "fxbarcode/datamatrix/BC_EncoderContext.h" -#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h" #include "fxbarcode/datamatrix/BC_SymbolInfo.h" #include "fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "fxbarcode/datamatrix/BC_TextEncoder.h" @@ -69,19 +69,16 @@ std::vector<uint8_t>& CBC_HighLevelEncoder::getBytesForMessage( CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_WideString ecLevel, int32_t& e) { - return encodeHighLevel(msg, ecLevel, FORCE_NONE, nullptr, nullptr, e); + return encodeHighLevel(msg, ecLevel, FORCE_NONE, e); } CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_WideString ecLevel, SymbolShapeHint shape, - CBC_Dimension* minSize, - CBC_Dimension* maxSize, int32_t& e) { CBC_EncoderContext context(msg, ecLevel, e); if (e != BCExceptionNO) return CFX_WideString(); context.setSymbolShape(shape); - context.setSizeConstraints(minSize, maxSize); if ((msg.Mid(0, 6) == MACRO_05_HEADER) && (msg.Mid(msg.GetLength() - 1, 1) == MACRO_TRAILER)) { context.writeCodeword(MACRO_05); |