summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-16 16:27:57 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-16 16:27:57 -0700
commit9555022ee550ee97415a86957686cc28716c4dee (patch)
tree00a82cd76cb540eaf9b0d4723739772f70b98cc1 /core/include
parent6c949d13ad2543e28cf174ecf457b5adcdf213bf (diff)
downloadpdfium-9555022ee550ee97415a86957686cc28716c4dee.tar.xz
Merge to XF: Add constructor for CPDF_ColorSpace.
Original review URL: https://codereview.chromium.org/1185903002. BUG=pdfium:170 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1182083004.
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfapi/fpdf_page.h1
-rw-r--r--core/include/fpdfapi/fpdf_resource.h12
2 files changed, 9 insertions, 4 deletions
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index e766504ee1..7aed626fae 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -21,7 +21,6 @@ class CPDF_StreamFilter;
class CPDF_AllStates;
class CPDF_ContentParser;
class CPDF_StreamContentParser;
-class CPDF_ResourceNaming;
#define PDFTRANS_GROUP 0x0100
#define PDFTRANS_ISOLATED 0x0200
#define PDFTRANS_KNOCKOUT 0x0400
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 2787d97329..fe2a1e48e7 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -644,11 +644,17 @@ public:
}
virtual void EnableStdConversion(FX_BOOL bEnabled);
- CPDF_Document* m_pDocument;
-protected:
- CPDF_ColorSpace();
+ CPDF_Document* const m_pDocument;
+protected:
+ CPDF_ColorSpace(CPDF_Document* pDoc, int family, int nComponents)
+ : m_pDocument(pDoc),
+ m_Family(family),
+ m_nComponents(nComponents),
+ m_pArray(nullptr),
+ m_dwStdConversion(0) {
+ }
virtual ~CPDF_ColorSpace() {}
virtual FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray)
{