From 625ad667d0c0c17d5bc11d505f04861d90b45078 Mon Sep 17 00:00:00 2001 From: weili Date: Wed, 15 Jun 2016 11:21:33 -0700 Subject: Make code compile with clang_use_chrome_plugin (part IV) This change mainly contains files in fpdfsdk/ 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 plus removing an unused file and splitting cxfa_eventparam out from fxfa.h BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2062313002 --- xfa/fxbarcode/BC_DecoderResult.h | 38 ---------------------- .../pdf417/BC_PDF417DecodedBitStreamParser.cpp | 1 - xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp | 1 - xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp | 1 - 4 files changed, 41 deletions(-) delete mode 100644 xfa/fxbarcode/BC_DecoderResult.h (limited to 'xfa/fxbarcode') diff --git a/xfa/fxbarcode/BC_DecoderResult.h b/xfa/fxbarcode/BC_DecoderResult.h deleted file mode 100644 index e4170c8955..0000000000 --- a/xfa/fxbarcode/BC_DecoderResult.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FXBARCODE_BC_DECODERRESULT_H_ -#define XFA_FXBARCODE_BC_DECODERRESULT_H_ - -#include "core/fxcrt/include/fx_basic.h" - -class CBC_DecoderResult { - public: - CBC_DecoderResult(CFX_ByteArray* rawBytes, - CFX_ByteString text, - CFX_ByteString ecLevel); - virtual ~CBC_DecoderResult(); - - CFX_ByteArray* getRawBytes(); - CFX_ByteString getText(); - CFX_ByteString getECLevel(); - int32_t getErrorsCorrected(); - void setErrorsCorrected(int32_t errorsCorrected); - int32_t getErasures(); - void setErasures(int32_t erasures); - void* getOther(); - void setOther(void* other); - - private: - CFX_ByteArray* m_rawBytes; - CFX_ByteString m_text; - CFX_ByteString m_ecLevel; - int32_t m_errorsCorrected; - int32_t m_erasures; - void* m_other; -}; - -#endif // XFA_FXBARCODE_BC_DECODERRESULT_H_ diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index 64ebbe13af..30632a494a 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -25,7 +25,6 @@ #include #include "third_party/bigint/BigIntegerLibrary.hh" -#include "xfa/fxbarcode/BC_DecoderResult.h" #include "xfa/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" #include "xfa/fxbarcode/utils.h" diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp index 894b5d3fad..7d1779657c 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp +++ b/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp @@ -26,7 +26,6 @@ #include "xfa/fxbarcode/BC_BinaryBitmap.h" #include "xfa/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/fxbarcode/BC_DecoderResult.h" #include "xfa/fxbarcode/BC_Reader.h" #include "xfa/fxbarcode/BC_ResultPoint.h" #include "xfa/fxbarcode/common/BC_CommonBitArray.h" diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index 479b65970e..fb33fe0d3f 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -22,7 +22,6 @@ #include -#include "xfa/fxbarcode/BC_DecoderResult.h" #include "xfa/fxbarcode/BC_ResultPoint.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" -- cgit v1.2.3