From 4c3b4aa6d1df54fe02912fed04a08adc6826310f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 17 Sep 2018 22:22:36 +0000 Subject: Make CBC_CodeBase::SetWideNarrowRatio() not virtual. Make CBC_Writer::SetWideNarrowRatio() virtual instead. Do the same for SetStartChar(), SetEndChar(), and SetErrorCorrectionLevel(). Change-Id: I70e87c0e9f8b772331105e57dd26075db3cfcb95 Reviewed-on: https://pdfium-review.googlesource.com/42602 Commit-Queue: Lei Zhang Reviewed-by: Henrique Nakashima --- fxbarcode/oned/BC_OnedCodaBarWriter.h | 6 +++--- fxbarcode/oned/BC_OnedCode39Writer.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'fxbarcode/oned') diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.h b/fxbarcode/oned/BC_OnedCodaBarWriter.h index ff30ab64d9..8147e04bb7 100644 --- a/fxbarcode/oned/BC_OnedCodaBarWriter.h +++ b/fxbarcode/oned/BC_OnedCodaBarWriter.h @@ -31,10 +31,10 @@ class CBC_OnedCodaBarWriter final : public CBC_OneDimWriter { WideString FilterContents(const WideStringView& contents) override; void SetDataLength(int32_t length) override; bool SetTextLocation(BC_TEXT_LOC location) override; + bool SetWideNarrowRatio(int8_t ratio) override; + bool SetStartChar(char start) override; + bool SetEndChar(char end) override; - virtual bool SetStartChar(char start); - virtual bool SetEndChar(char end); - virtual bool SetWideNarrowRatio(int8_t ratio); virtual bool FindChar(wchar_t ch, bool isContent); WideString encodedContents(const WideStringView& contents); diff --git a/fxbarcode/oned/BC_OnedCode39Writer.h b/fxbarcode/oned/BC_OnedCode39Writer.h index e136073209..b6102bc535 100644 --- a/fxbarcode/oned/BC_OnedCode39Writer.h +++ b/fxbarcode/oned/BC_OnedCode39Writer.h @@ -29,8 +29,7 @@ class CBC_OnedCode39Writer final : public CBC_OneDimWriter { WideString FilterContents(const WideStringView& contents) override; WideString RenderTextContents(const WideStringView& contents) override; bool SetTextLocation(BC_TEXT_LOC location) override; - - virtual bool SetWideNarrowRatio(int8_t ratio); + bool SetWideNarrowRatio(int8_t ratio) override; bool encodedContents(const WideStringView& contents, WideString* result); -- cgit v1.2.3