summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/parser/cpdf_read_validator.h6
-rw-r--r--core/fpdfapi/render/cpdf_dibsource.h7
-rw-r--r--core/fpdfapi/render/cpdf_dibtransferfunc.h3
3 files changed, 7 insertions, 9 deletions
diff --git a/core/fpdfapi/parser/cpdf_read_validator.h b/core/fpdfapi/parser/cpdf_read_validator.h
index 31c33fa36a..281a2ea194 100644
--- a/core/fpdfapi/parser/cpdf_read_validator.h
+++ b/core/fpdfapi/parser/cpdf_read_validator.h
@@ -10,9 +10,6 @@
class CPDF_ReadValidator : public IFX_SeekableReadStream {
public:
- template <typename T, typename... Args>
- friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
class Session {
public:
explicit Session(CPDF_ReadValidator* validator);
@@ -28,6 +25,9 @@ class CPDF_ReadValidator : public IFX_SeekableReadStream {
hints_ = hints;
}
+ template <typename T, typename... Args>
+ friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
+
bool read_error() const { return read_error_; }
bool has_unavailable_data() const { return has_unavailable_data_; }
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h
index 4646bf2fe9..50d9c6ef9c 100644
--- a/core/fpdfapi/render/cpdf_dibsource.h
+++ b/core/fpdfapi/render/cpdf_dibsource.h
@@ -41,12 +41,10 @@ struct DIB_COMP_DATA {
class CPDF_DIBSource : public CFX_DIBSource {
public:
- template <typename T, typename... Args>
- friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
enum class LoadState : uint8_t { kFail, kSuccess, kContinue };
- ~CPDF_DIBSource() override;
+ template <typename T, typename... Args>
+ friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
bool Load(CPDF_Document* pDoc, const CPDF_Stream* pStream);
@@ -80,6 +78,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
private:
CPDF_DIBSource();
+ ~CPDF_DIBSource() override;
LoadState StartLoadMask();
LoadState StartLoadMaskDIB();
diff --git a/core/fpdfapi/render/cpdf_dibtransferfunc.h b/core/fpdfapi/render/cpdf_dibtransferfunc.h
index 34f5bb1abe..61abd2e23c 100644
--- a/core/fpdfapi/render/cpdf_dibtransferfunc.h
+++ b/core/fpdfapi/render/cpdf_dibtransferfunc.h
@@ -20,8 +20,6 @@ class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
template <typename T, typename... Args>
friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
- ~CPDF_DIBTransferFunc() override;
-
// CFX_FilteredDIB
FXDIB_Format GetDestFormat() override;
FX_ARGB* GetDestPalette() override;
@@ -35,6 +33,7 @@ class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
private:
explicit CPDF_DIBTransferFunc(
const RetainPtr<CPDF_TransferFunc>& pTransferFunc);
+ ~CPDF_DIBTransferFunc() override;
RetainPtr<CPDF_TransferFunc> m_pTransferFunc;
const uint8_t* m_RampR;