diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-10 00:18:09 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-10 00:18:09 -0800 |
| commit | 36a9d086bc8a89d699461b3a03c56745ceae98c3 (patch) | |
| tree | dd8ac69676b25b10d1ec3f75069ac9d0a8db9422 /core/src/fpdfapi/fpdf_render/render_int.h | |
| parent | 5fae972302efd368a3ecc7cfa655891323c59a1b (diff) | |
| download | pdfium-36a9d086bc8a89d699461b3a03c56745ceae98c3.tar.xz | |
Merge to XFA: Cleanup CPDF_DIBSource::LoadColorInfo() and ValidateDictParam().
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1507043004 .
(cherry picked from commit d9324d8f7345d4546c06c4a9d6cd497b0f7f3ad2)
Review URL: https://codereview.chromium.org/1512203003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/render_int.h')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index d764c9a5ff..5b862b3401 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -561,8 +561,8 @@ class CPDF_DIBSource : public CFX_DIBSource { FX_BOOL m_bHasMask; private: - FX_BOOL LoadColorInfo(CPDF_Dictionary* pFormResources, - CPDF_Dictionary* pPageResources); + bool LoadColorInfo(const CPDF_Dictionary* pFormResources, + const CPDF_Dictionary* pPageResources); DIB_COMP_DATA* GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX_BOOL& bColorKey); CPDF_DIBSource* LoadMask(FX_DWORD& MatteColor); |