diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-09-17 18:25:32 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-17 18:25:32 +0000 |
| commit | cb798258c433bec7087948fcbfff14d1e7683006 (patch) | |
| tree | bc873a405dbfe7c957d75a1748acce11c7f473e7 /fxbarcode | |
| parent | c5709dd345c748016a637b2104544895223f8fc7 (diff) | |
| download | pdfium-cb798258c433bec7087948fcbfff14d1e7683006.tar.xz | |
Fix final/protected conflicts.
Classes marked |final| should not have |protected| members. In turn,
"private field m_dwEncryptObjNum is not used" warning is produced.
Change-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327
Reviewed-on: https://pdfium-review.googlesource.com/42611
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxbarcode')
| -rw-r--r-- | fxbarcode/oned/BC_OnedEAN13Writer.h | 3 | ||||
| -rw-r--r-- | fxbarcode/oned/BC_OnedEAN8Writer.h | 3 | ||||
| -rw-r--r-- | fxbarcode/oned/BC_OnedUPCAWriter.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.h b/fxbarcode/oned/BC_OnedEAN13Writer.h index 3c7ff2eba3..c80091897f 100644 --- a/fxbarcode/oned/BC_OnedEAN13Writer.h +++ b/fxbarcode/oned/BC_OnedEAN13Writer.h @@ -31,14 +31,13 @@ class CBC_OnedEAN13Writer final : public CBC_OneDimWriter { int32_t CalcChecksum(const ByteString& contents); - protected: + private: bool ShowChars(const WideStringView& contents, CFX_RenderDevice* device, const CFX_Matrix* matrix, int32_t barWidth, int32_t multiple) override; - private: int32_t m_codeWidth; }; diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.h b/fxbarcode/oned/BC_OnedEAN8Writer.h index 269156a25e..853d4dace8 100644 --- a/fxbarcode/oned/BC_OnedEAN8Writer.h +++ b/fxbarcode/oned/BC_OnedEAN8Writer.h @@ -34,14 +34,13 @@ class CBC_OnedEAN8Writer final : public CBC_OneDimWriter { bool SetTextLocation(BC_TEXT_LOC location); int32_t CalcChecksum(const ByteString& contents); - protected: + private: bool ShowChars(const WideStringView& contents, CFX_RenderDevice* device, const CFX_Matrix* matrix, int32_t barWidth, int32_t multiple) override; - private: static constexpr int32_t kDefaultCodeWidth = 3 + (7 * 4) + 5 + (7 * 4) + 3; int32_t m_codeWidth = kDefaultCodeWidth; }; diff --git a/fxbarcode/oned/BC_OnedUPCAWriter.h b/fxbarcode/oned/BC_OnedUPCAWriter.h index 1a9f091f60..6101b4d8d1 100644 --- a/fxbarcode/oned/BC_OnedUPCAWriter.h +++ b/fxbarcode/oned/BC_OnedUPCAWriter.h @@ -36,14 +36,13 @@ class CBC_OnedUPCAWriter final : public CBC_OneDimWriter { void Init(); int32_t CalcChecksum(const ByteString& contents); - protected: + private: bool ShowChars(const WideStringView& contents, CFX_RenderDevice* device, const CFX_Matrix* matrix, int32_t barWidth, int32_t multiple) override; - private: std::unique_ptr<CBC_OnedEAN13Writer> m_subWriter; }; |