From 29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467 Mon Sep 17 00:00:00 2001 From: weili Date: Tue, 14 Jun 2016 18:20:04 -0700 Subject: Make code compile with clang_use_chrome_plugin (part III) This change contains files in xfa/fxbarcode directory. This is part of the efforts to make PDFium code compilable by Clang chromium style plugins. The changes are mainly the following: -- move inline constructor/destructor of complex class/struct out-of-line; -- add constructor/destructor of complex class/struct if not explicitly defined; -- add explicit out-of-line copy constructor when needed; -- move inline virtual functions out-of-line; -- Properly mark virtual functions with 'override'; -- some minor cleanups; BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2067903002 --- xfa/fxbarcode/oned/BC_OneDimReader.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'xfa/fxbarcode/oned/BC_OneDimReader.h') diff --git a/xfa/fxbarcode/oned/BC_OneDimReader.h b/xfa/fxbarcode/oned/BC_OneDimReader.h index f572d6fd1e..bd46a189f4 100644 --- a/xfa/fxbarcode/oned/BC_OneDimReader.h +++ b/xfa/fxbarcode/oned/BC_OneDimReader.h @@ -26,17 +26,19 @@ class CBC_OneDimReader : public CBC_OneDReader { static const int32_t L_AND_G_PATTERNS[20][4]; CBC_OneDimReader(); - virtual ~CBC_OneDimReader(); + ~CBC_OneDimReader() override; + // CBC_OneDReader CFX_ByteString DecodeRow(int32_t rowNumber, CBC_CommonBitArray* row, int32_t hints, - int32_t& e); - CFX_ByteString DecodeRow(int32_t rowNumber, - CBC_CommonBitArray* row, - CFX_Int32Array* startGuardRange, - int32_t hints, - int32_t& e); + int32_t& e) override; + + virtual CFX_ByteString DecodeRow(int32_t rowNumber, + CBC_CommonBitArray* row, + CFX_Int32Array* startGuardRange, + int32_t hints, + int32_t& e); protected: CFX_Int32Array* FindStartGuardPattern(CBC_CommonBitArray* row, int32_t& e); @@ -55,9 +57,7 @@ class CBC_OneDimReader : public CBC_OneDReader { virtual int32_t DecodeMiddle(CBC_CommonBitArray* row, CFX_Int32Array* startRange, CFX_ByteString& resultResult, - int32_t& e) { - return 0; - } + int32_t& e) = 0; virtual CFX_Int32Array* DecodeEnd(CBC_CommonBitArray* row, int32_t endStart, int32_t& e); -- cgit v1.2.3