From 1badb85e5c3a4b4cd42ca1a2b223d6b3bc67cc4a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 20 Apr 2017 15:58:56 -0700 Subject: Change more fxbarcode to use return values. Change-Id: Idcc05fb8c5a1448f552b4db5ae131ad82aef4d59 Reviewed-on: https://pdfium-review.googlesource.com/4258 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- fxbarcode/oned/BC_OnedCodaBarWriter.h | 38 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'fxbarcode/oned/BC_OnedCodaBarWriter.h') diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.h b/fxbarcode/oned/BC_OnedCodaBarWriter.h index f9ecc1b11a..94933612f5 100644 --- a/fxbarcode/oned/BC_OnedCodaBarWriter.h +++ b/fxbarcode/oned/BC_OnedCodaBarWriter.h @@ -18,41 +18,33 @@ class CBC_OnedCodaBarWriter : public CBC_OneDimWriter { ~CBC_OnedCodaBarWriter() override; // CBC_OneDimWriter - uint8_t* Encode(const CFX_ByteString& contents, - int32_t& outLength, - int32_t& e) override; - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e) override; - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e) override; + uint8_t* EncodeImpl(const CFX_ByteString& contents, + int32_t& outLength) override; + uint8_t* EncodeWithHint(const CFX_ByteString& contents, + BCFORMAT format, + int32_t& outWidth, + int32_t& outHeight, + int32_t hints) override; + bool RenderResult(const CFX_WideStringC& contents, + uint8_t* code, + int32_t codeLength, + bool isDevice) override; bool CheckContentValidity(const CFX_WideStringC& contents) override; CFX_WideString FilterContents(const CFX_WideStringC& contents) override; void SetDataLength(int32_t length) override; - virtual CFX_WideString encodedContents(const CFX_WideStringC& contents); virtual bool SetStartChar(char start); virtual bool SetEndChar(char end); virtual bool SetTextLocation(BC_TEXT_LOC location); - virtual bool SetWideNarrowRatio(int32_t ratio); + virtual bool SetWideNarrowRatio(int8_t ratio); virtual bool FindChar(wchar_t ch, bool isContent); - private: - void RenderResult(const CFX_WideStringC& contents, - uint8_t* code, - int32_t codeLength, - bool isDevice, - int32_t& e) override; + CFX_WideString encodedContents(const CFX_WideStringC& contents); + private: char m_chStart; char m_chEnd; - int32_t m_iWideNarrRatio; + int8_t m_iWideNarrRatio; }; #endif // FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_ -- cgit v1.2.3