From 1bbcb35e4e5593998837c832eabf16a91a695387 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 25 May 2017 18:43:44 -0700 Subject: Replace SymbolShapeHint with a boolean. Delete BC_SymbolShapeHint.h since there is nothing left in it. Change-Id: Ic991064cd396f224966e5f3e8537fc62b5a9908a Reviewed-on: https://pdfium-review.googlesource.com/5835 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- fxbarcode/datamatrix/BC_DataMatrixWriter.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'fxbarcode/datamatrix/BC_DataMatrixWriter.cpp') diff --git a/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 19b6346f0a..98af282f8f 100644 --- a/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -40,7 +40,6 @@ #include "fxbarcode/datamatrix/BC_ErrorCorrection.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" #include "fxbarcode/datamatrix/BC_X12Encoder.h" #include "third_party/base/ptr_util.h" @@ -115,15 +114,14 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents, if (outWidth < 0 || outHeight < 0) return nullptr; - SymbolShapeHint shape = FORCE_SQUARE; CFX_WideString ecLevel; int32_t e = BCExceptionNO; CFX_WideString encoded = - CBC_HighLevelEncoder::encodeHighLevel(contents, ecLevel, shape, e); + CBC_HighLevelEncoder::encodeHighLevel(contents, ecLevel, false, e); if (e != BCExceptionNO) return nullptr; CBC_SymbolInfo* symbolInfo = - CBC_SymbolInfo::lookup(encoded.GetLength(), shape, e); + CBC_SymbolInfo::lookup(encoded.GetLength(), false, e); if (e != BCExceptionNO) return nullptr; CFX_WideString codewords = -- cgit v1.2.3