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

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

Issue 1853233002: Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Fix CPDF_Name::GetConstString() 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
« no previous file with comments | « core/fpdfapi/fpdf_font/fpdf_font_cid.cpp ('k') | core/fpdfapi/fpdf_page/fpdf_page_doc.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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 } 108 }
109 case FXBSTR_ID('T', 'R', '2', 0): 109 case FXBSTR_ID('T', 'R', '2', 0):
110 pGeneralState->m_pTR = 110 pGeneralState->m_pTR =
111 (pObject && !pObject->IsName()) ? pObject : nullptr; 111 (pObject && !pObject->IsName()) ? pObject : nullptr;
112 break; 112 break;
113 case FXBSTR_ID('B', 'M', 0, 0): { 113 case FXBSTR_ID('B', 'M', 0, 0): {
114 CPDF_Array* pArray = pObject->AsArray(); 114 CPDF_Array* pArray = pObject->AsArray();
115 CFX_ByteString mode = 115 CFX_ByteString mode =
116 pArray ? pArray->GetStringAt(0) : pObject->GetString(); 116 pArray ? pArray->GetStringAt(0) : pObject->GetString();
117 117
118 pGeneralState->SetBlendMode(mode); 118 pGeneralState->SetBlendMode(mode.AsByteStringC());
119 if (pGeneralState->m_BlendType > FXDIB_BLEND_MULTIPLY) { 119 if (pGeneralState->m_BlendType > FXDIB_BLEND_MULTIPLY) {
120 pParser->GetPageObjectHolder()->SetBackgroundAlphaNeeded(TRUE); 120 pParser->GetPageObjectHolder()->SetBackgroundAlphaNeeded(TRUE);
121 } 121 }
122 break; 122 break;
123 } 123 }
124 case FXBSTR_ID('S', 'M', 'a', 's'): 124 case FXBSTR_ID('S', 'M', 'a', 's'):
125 if (ToDictionary(pObject)) { 125 if (ToDictionary(pObject)) {
126 pGeneralState->m_pSoftMask = pObject; 126 pGeneralState->m_pSoftMask = pObject;
127 FXSYS_memcpy(pGeneralState->m_SMaskMatrix, 127 FXSYS_memcpy(pGeneralState->m_SMaskMatrix,
128 &pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix)); 128 &pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix));
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 case FXBSTR_ID('A', 'I', 'S', 0): 177 case FXBSTR_ID('A', 'I', 'S', 0):
178 pGeneralState->m_AlphaSource = pObject->GetInteger(); 178 pGeneralState->m_AlphaSource = pObject->GetInteger();
179 break; 179 break;
180 case FXBSTR_ID('T', 'K', 0, 0): 180 case FXBSTR_ID('T', 'K', 0, 0):
181 pGeneralState->m_TextKnockout = pObject->GetInteger(); 181 pGeneralState->m_TextKnockout = pObject->GetInteger();
182 break; 182 break;
183 } 183 }
184 } 184 }
185 pGeneralState->m_Matrix = m_CTM; 185 pGeneralState->m_Matrix = m_CTM;
186 } 186 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_font/fpdf_font_cid.cpp ('k') | core/fpdfapi/fpdf_page/fpdf_page_doc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698