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

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

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 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
« no previous file with comments | « core/fpdfapi/fpdf_font/ttgsubtable.cpp ('k') | core/fpdfapi/fpdf_page/cpdf_colorspace.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_allstates.h" 7 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
8 8
9 #include "core/fpdfapi/fpdf_page/pageint.h" 9 #include "core/fpdfapi/fpdf_page/pageint.h"
10 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" 10 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 pParser->GetPageObjectHolder()->SetBackgroundAlphaNeeded(TRUE); 119 pParser->GetPageObjectHolder()->SetBackgroundAlphaNeeded(TRUE);
120 } 120 }
121 break; 121 break;
122 } 122 }
123 case FXBSTR_ID('S', 'M', 'a', 's'): 123 case FXBSTR_ID('S', 'M', 'a', 's'):
124 if (ToDictionary(pObject)) { 124 if (ToDictionary(pObject)) {
125 pGeneralState->m_pSoftMask = pObject; 125 pGeneralState->m_pSoftMask = pObject;
126 FXSYS_memcpy(pGeneralState->m_SMaskMatrix, 126 FXSYS_memcpy(pGeneralState->m_SMaskMatrix,
127 &pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix)); 127 &pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix));
128 } else { 128 } else {
129 pGeneralState->m_pSoftMask = NULL; 129 pGeneralState->m_pSoftMask = nullptr;
130 } 130 }
131 break; 131 break;
132 case FXBSTR_ID('C', 'A', 0, 0): 132 case FXBSTR_ID('C', 'A', 0, 0):
133 pGeneralState->m_StrokeAlpha = ClipFloat(pObject->GetNumber()); 133 pGeneralState->m_StrokeAlpha = ClipFloat(pObject->GetNumber());
134 break; 134 break;
135 case FXBSTR_ID('c', 'a', 0, 0): 135 case FXBSTR_ID('c', 'a', 0, 0):
136 pGeneralState->m_FillAlpha = ClipFloat(pObject->GetNumber()); 136 pGeneralState->m_FillAlpha = ClipFloat(pObject->GetNumber());
137 break; 137 break;
138 case FXBSTR_ID('O', 'P', 0, 0): 138 case FXBSTR_ID('O', 'P', 0, 0):
139 pGeneralState->m_StrokeOP = pObject->GetInteger(); 139 pGeneralState->m_StrokeOP = pObject->GetInteger();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 case FXBSTR_ID('A', 'I', 'S', 0): 176 case FXBSTR_ID('A', 'I', 'S', 0):
177 pGeneralState->m_AlphaSource = pObject->GetInteger(); 177 pGeneralState->m_AlphaSource = pObject->GetInteger();
178 break; 178 break;
179 case FXBSTR_ID('T', 'K', 0, 0): 179 case FXBSTR_ID('T', 'K', 0, 0):
180 pGeneralState->m_TextKnockout = pObject->GetInteger(); 180 pGeneralState->m_TextKnockout = pObject->GetInteger();
181 break; 181 break;
182 } 182 }
183 } 183 }
184 pGeneralState->m_Matrix = m_CTM; 184 pGeneralState->m_Matrix = m_CTM;
185 } 185 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_font/ttgsubtable.cpp ('k') | core/fpdfapi/fpdf_page/cpdf_colorspace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698