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

Side by Side Diff: core/fpdfdoc/doc_ap.cpp

Issue 1801383002: Re-enable several MSVC warnings (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: rebase again Created 4 years, 9 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_render/fpdf_render_text.cpp ('k') | core/fxcodec/codec/codec_int.h » ('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 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 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_parser/include/cpdf_array.h" 7 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
8 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" 8 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
9 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" 9 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
10 #include "core/fpdfdoc/doc_utils.h" 10 #include "core/fpdfdoc/doc_utils.h"
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } 296 }
297 FX_FLOAT fFontSize = FX_atof(syntax.GetWord()); 297 FX_FLOAT fFontSize = FX_atof(syntax.GetWord());
298 CPVT_Color crText = ParseColor(DA); 298 CPVT_Color crText = ParseColor(DA);
299 FX_BOOL bUseFormRes = FALSE; 299 FX_BOOL bUseFormRes = FALSE;
300 CPDF_Dictionary* pFontDict = NULL; 300 CPDF_Dictionary* pFontDict = NULL;
301 CPDF_Dictionary* pDRDict = pAnnotDict->GetDictBy("DR"); 301 CPDF_Dictionary* pDRDict = pAnnotDict->GetDictBy("DR");
302 if (!pDRDict) { 302 if (!pDRDict) {
303 pDRDict = pFormDict->GetDictBy("DR"); 303 pDRDict = pFormDict->GetDictBy("DR");
304 bUseFormRes = TRUE; 304 bUseFormRes = TRUE;
305 } 305 }
306 CPDF_Dictionary* pDRFontDict = NULL; 306 CPDF_Dictionary* pDRFontDict = pDRDict ? pDRDict->GetDictBy("Font") : nullptr;
307 if (pDRDict && (pDRFontDict = pDRDict->GetDictBy("Font"))) { 307 if (pDRFontDict) {
308 pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1)); 308 pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1));
309 if (!pFontDict && !bUseFormRes) { 309 if (!pFontDict && !bUseFormRes) {
310 pDRDict = pFormDict->GetDictBy("DR"); 310 pDRDict = pFormDict->GetDictBy("DR");
311 pDRFontDict = pDRDict->GetDictBy("Font"); 311 pDRFontDict = pDRDict->GetDictBy("Font");
312 if (pDRFontDict) { 312 if (pDRFontDict) {
313 pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1)); 313 pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1));
314 } 314 }
315 } 315 }
316 } 316 }
317 if (!pDRFontDict) { 317 if (!pDRFontDict) {
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 case CPVT_Color::kCMYK: 927 case CPVT_Color::kCMYK:
928 sColorStream << color.fColor1 << " " << color.fColor2 << " " 928 sColorStream << color.fColor1 << " " << color.fColor2 << " "
929 << color.fColor3 << " " << color.fColor4 << " " 929 << color.fColor3 << " " << color.fColor4 << " "
930 << (bFillOrStroke ? "k" : "K") << "\n"; 930 << (bFillOrStroke ? "k" : "K") << "\n";
931 break; 931 break;
932 case CPVT_Color::kTransparent: 932 case CPVT_Color::kTransparent:
933 break; 933 break;
934 } 934 }
935 return sColorStream.GetByteString(); 935 return sColorStream.GetByteString();
936 } 936 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_render/fpdf_render_text.cpp ('k') | core/fxcodec/codec/codec_int.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698