Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Side by Side Diff: core/fpdfapi/fpdf_page/cpdf_shadingpattern.cpp

Issue 1867183002: Use std::vector as internal storage for CPDF_Array (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h" 7 #include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
8 8
9 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" 9 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
10 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" 10 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
(...skipping 30 matching lines...) Expand all
41 m_Pattern2Form = pDict->GetMatrixBy("Matrix"); 41 m_Pattern2Form = pDict->GetMatrixBy("Matrix");
42 m_pShadingObj = pDict->GetDirectObjectBy("Shading"); 42 m_pShadingObj = pDict->GetDirectObjectBy("Shading");
43 if (parentMatrix) 43 if (parentMatrix)
44 m_Pattern2Form.Concat(*parentMatrix); 44 m_Pattern2Form.Concat(*parentMatrix);
45 } 45 }
46 for (size_t i = 0; i < FX_ArraySize(m_pFunctions); ++i) 46 for (size_t i = 0; i < FX_ArraySize(m_pFunctions); ++i)
47 m_pFunctions[i] = nullptr; 47 m_pFunctions[i] = nullptr;
48 } 48 }
49 49
50 CPDF_ShadingPattern::~CPDF_ShadingPattern() { 50 CPDF_ShadingPattern::~CPDF_ShadingPattern() {
51 for (int i = 0; i < m_nFuncs; ++i) 51 for (size_t i = 0; i < m_nFuncs; ++i)
52 delete m_pFunctions[i]; 52 delete m_pFunctions[i];
53 53
54 CPDF_ColorSpace* pCS = m_pCountedCS ? m_pCountedCS->get() : nullptr; 54 CPDF_ColorSpace* pCS = m_pCountedCS ? m_pCountedCS->get() : nullptr;
55 if (pCS && m_pDocument) 55 if (pCS && m_pDocument)
56 m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray()); 56 m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray());
57 } 57 }
58 58
59 FX_BOOL CPDF_ShadingPattern::Load() { 59 FX_BOOL CPDF_ShadingPattern::Load() {
60 if (m_ShadingType != kInvalidShading) 60 if (m_ShadingType != kInvalidShading)
61 return TRUE; 61 return TRUE;
62 62
63 CPDF_Dictionary* pShadingDict = 63 CPDF_Dictionary* pShadingDict =
64 m_pShadingObj ? m_pShadingObj->GetDict() : nullptr; 64 m_pShadingObj ? m_pShadingObj->GetDict() : nullptr;
65 if (!pShadingDict) 65 if (!pShadingDict)
66 return FALSE; 66 return FALSE;
67 67
68 if (m_nFuncs) { 68 if (m_nFuncs) {
69 for (int i = 0; i < m_nFuncs; i++) 69 for (size_t i = 0; i < m_nFuncs; i++)
70 delete m_pFunctions[i]; 70 delete m_pFunctions[i];
71 m_nFuncs = 0; 71 m_nFuncs = 0;
72 } 72 }
73 CPDF_Object* pFunc = pShadingDict->GetDirectObjectBy("Function"); 73 CPDF_Object* pFunc = pShadingDict->GetDirectObjectBy("Function");
74 if (pFunc) { 74 if (pFunc) {
75 if (CPDF_Array* pArray = pFunc->AsArray()) { 75 if (CPDF_Array* pArray = pFunc->AsArray()) {
76 m_nFuncs = std::min<int>(pArray->GetCount(), 4); 76 m_nFuncs = std::min<size_t>(pArray->GetCount(), 4);
77 77
78 for (int i = 0; i < m_nFuncs; i++) 78 for (size_t i = 0; i < m_nFuncs; i++)
79 m_pFunctions[i] = CPDF_Function::Load(pArray->GetDirectObjectAt(i)); 79 m_pFunctions[i] = CPDF_Function::Load(pArray->GetDirectObjectAt(i));
80 } else { 80 } else {
81 m_pFunctions[0] = CPDF_Function::Load(pFunc); 81 m_pFunctions[0] = CPDF_Function::Load(pFunc);
82 m_nFuncs = 1; 82 m_nFuncs = 1;
83 } 83 }
84 } 84 }
85 CPDF_Object* pCSObj = pShadingDict->GetDirectObjectBy("ColorSpace"); 85 CPDF_Object* pCSObj = pShadingDict->GetDirectObjectBy("ColorSpace");
86 if (!pCSObj) 86 if (!pCSObj)
87 return FALSE; 87 return FALSE;
88 88
89 CPDF_DocPageData* pDocPageData = m_pDocument->GetPageData(); 89 CPDF_DocPageData* pDocPageData = m_pDocument->GetPageData();
90 m_pCS = pDocPageData->GetColorSpace(pCSObj, nullptr); 90 m_pCS = pDocPageData->GetColorSpace(pCSObj, nullptr);
91 if (m_pCS) 91 if (m_pCS)
92 m_pCountedCS = pDocPageData->FindColorSpacePtr(m_pCS->GetArray()); 92 m_pCountedCS = pDocPageData->FindColorSpacePtr(m_pCS->GetArray());
93 93
94 m_ShadingType = ToShadingType(pShadingDict->GetIntegerBy("ShadingType")); 94 m_ShadingType = ToShadingType(pShadingDict->GetIntegerBy("ShadingType"));
95 95
96 // We expect to have a stream if our shading type is a mesh. 96 // We expect to have a stream if our shading type is a mesh.
97 if (IsMeshShading() && !ToStream(m_pShadingObj)) 97 if (IsMeshShading() && !ToStream(m_pShadingObj))
98 return FALSE; 98 return FALSE;
99 99
100 return TRUE; 100 return TRUE;
101 } 101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698