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

Side by Side Diff: core/fpdfdoc/cpvt_color.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_parser/include/cpdf_object.h ('k') | core/fpdfdoc/cpvt_fontmap.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/fpdfdoc/cpvt_color.h" 7 #include "core/fpdfdoc/cpvt_color.h"
8 8
9 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" 9 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
10 10
11 // Static. 11 // Static.
12 CPVT_Color CPVT_Color::ParseColor(const CFX_ByteString& str) { 12 CPVT_Color CPVT_Color::ParseColor(const CFX_ByteString& str) {
13 CPDF_SimpleParser syntax(str); 13 CPDF_SimpleParser syntax(str.AsByteStringC());
14 if (syntax.FindTagParamFromStart("g", 1)) 14 if (syntax.FindTagParamFromStart("g", 1))
15 return CPVT_Color(CPVT_Color::kGray, FX_atof(syntax.GetWord())); 15 return CPVT_Color(CPVT_Color::kGray, FX_atof(syntax.GetWord()));
16 16
17 if (syntax.FindTagParamFromStart("rg", 3)) { 17 if (syntax.FindTagParamFromStart("rg", 3)) {
18 FX_FLOAT f1 = FX_atof(syntax.GetWord()); 18 FX_FLOAT f1 = FX_atof(syntax.GetWord());
19 FX_FLOAT f2 = FX_atof(syntax.GetWord()); 19 FX_FLOAT f2 = FX_atof(syntax.GetWord());
20 FX_FLOAT f3 = FX_atof(syntax.GetWord()); 20 FX_FLOAT f3 = FX_atof(syntax.GetWord());
21 return CPVT_Color(CPVT_Color::kRGB, f1, f2, f3); 21 return CPVT_Color(CPVT_Color::kRGB, f1, f2, f3);
22 } 22 }
23 if (syntax.FindTagParamFromStart("k", 4)) { 23 if (syntax.FindTagParamFromStart("k", 4)) {
(...skipping 18 matching lines...) Expand all
42 array.GetFloatAt(1), array.GetFloatAt(2)); 42 array.GetFloatAt(1), array.GetFloatAt(2));
43 break; 43 break;
44 case 4: 44 case 4:
45 rt = CPVT_Color(CPVT_Color::kCMYK, array.GetFloatAt(0), 45 rt = CPVT_Color(CPVT_Color::kCMYK, array.GetFloatAt(0),
46 array.GetFloatAt(1), array.GetFloatAt(2), 46 array.GetFloatAt(1), array.GetFloatAt(2),
47 array.GetFloatAt(3)); 47 array.GetFloatAt(3));
48 break; 48 break;
49 } 49 }
50 return rt; 50 return rt;
51 } 51 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_parser/include/cpdf_object.h ('k') | core/fpdfdoc/cpvt_fontmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698