From 66568bcd683dd7b18672cb3aebca4487e9203519 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 26 Apr 2017 15:22:00 -0700 Subject: Assert CPDF_Pattern always has a valid CPDF_Document pointer. Same for CPDF_DocPageData. Change-Id: I8f2f559123dbb2f3623d957e4074d5f9d191797f Reviewed-on: https://pdfium-review.googlesource.com/4501 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- core/fpdfapi/page/cpdf_pattern.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'core/fpdfapi/page/cpdf_pattern.cpp') diff --git a/core/fpdfapi/page/cpdf_pattern.cpp b/core/fpdfapi/page/cpdf_pattern.cpp index b0a2d81bca..88e5dee35c 100644 --- a/core/fpdfapi/page/cpdf_pattern.cpp +++ b/core/fpdfapi/page/cpdf_pattern.cpp @@ -6,13 +6,17 @@ #include "core/fpdfapi/page/cpdf_pattern.h" -CPDF_Pattern::CPDF_Pattern(PatternType type, - CPDF_Document* pDoc, +#include "core/fpdfapi/parser/cpdf_dictionary.h" + +CPDF_Pattern::CPDF_Pattern(CPDF_Document* pDoc, CPDF_Object* pObj, const CFX_Matrix& parentMatrix) - : m_PatternType(type), - m_pDocument(pDoc), - m_pPatternObj(pObj), - m_ParentMatrix(parentMatrix) {} + : m_pDocument(pDoc), m_pPatternObj(pObj), m_ParentMatrix(parentMatrix) {} CPDF_Pattern::~CPDF_Pattern() {} + +void CPDF_Pattern::SetPatternToFormMatrix() { + CPDF_Dictionary* pDict = pattern_obj()->GetDict(); + m_Pattern2Form = pDict->GetMatrixFor("Matrix"); + m_Pattern2Form.Concat(m_ParentMatrix); +} -- cgit v1.2.3