Index: fpdfsdk/include/fsdk_define.h |
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h |
index 536e35886f549e611083cc720a900b191595a01b..a8a02d665e11975adf6829eeaacad31fd97498d2 100644 |
--- a/fpdfsdk/include/fsdk_define.h |
+++ b/fpdfsdk/include/fsdk_define.h |
@@ -9,8 +9,6 @@ |
#include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" |
#include "core/fpdfdoc/include/fpdf_doc.h" |
-#include "core/fxge/include/fx_ge.h" |
-#include "core/fxge/include/fx_ge_win32.h" |
#include "public/fpdfview.h" |
#ifdef PDF_ENABLE_XFA |
@@ -63,22 +61,23 @@ class CPDF_CustomAccess final : public IFX_FileRead { |
#ifdef PDF_ENABLE_XFA |
class CFPDF_FileStream : public IFX_FileStream { |
public: |
- CFPDF_FileStream(FPDF_FILEHANDLER* pFS); |
- virtual ~CFPDF_FileStream() {} |
- |
- virtual IFX_FileStream* Retain(); |
- virtual void Release(); |
- |
- virtual FX_FILESIZE GetSize(); |
- virtual FX_BOOL IsEOF(); |
- virtual FX_FILESIZE GetPosition() { return m_nCurPos; } |
- virtual void SetPosition(FX_FILESIZE pos) { m_nCurPos = pos; } |
- virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size); |
- virtual size_t ReadBlock(void* buffer, size_t size); |
- virtual FX_BOOL WriteBlock(const void* buffer, |
- FX_FILESIZE offset, |
- size_t size); |
- virtual FX_BOOL Flush(); |
+ explicit CFPDF_FileStream(FPDF_FILEHANDLER* pFS); |
+ ~CFPDF_FileStream() override {} |
+ |
+ // IFX_FileStream: |
+ IFX_FileStream* Retain() override; |
+ void Release() override; |
+ FX_FILESIZE GetSize() override; |
+ FX_BOOL IsEOF() override; |
+ FX_FILESIZE GetPosition() override { return m_nCurPos; } |
+ FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; |
+ size_t ReadBlock(void* buffer, size_t size) override; |
+ FX_BOOL WriteBlock(const void* buffer, |
+ FX_FILESIZE offset, |
+ size_t size) override; |
+ FX_BOOL Flush() override; |
+ |
+ void SetPosition(FX_FILESIZE pos) { m_nCurPos = pos; } |
protected: |
FPDF_FILEHANDLER* m_pFS; |