summaryrefslogtreecommitdiff
path: root/core/fpdfapi/page/cpdf_color.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-04-12 21:23:15 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-04-12 21:23:15 +0000
commit008b928ea39904374bc0dc8888e27bc48c812bda (patch)
tree5525b4c893aa2eae0f188747d64b6ead68225993 /core/fpdfapi/page/cpdf_color.cpp
parent1638179e85863b5045fcea2282fd3e0622aeac13 (diff)
downloadpdfium-008b928ea39904374bc0dc8888e27bc48c812bda.tar.xz
Rename one CPDF_Color::SetValue() variant.
Rename it to SetValueForPattern() and combine the components parameters into a std::vector. Fix the callers to use std::vector as well. Change-Id: Ib3426e0ffdb164f0fbb10d462ad251bf91165925 Reviewed-on: https://pdfium-review.googlesource.com/30450 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_color.cpp')
-rw-r--r--core/fpdfapi/page/cpdf_color.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_color.cpp b/core/fpdfapi/page/cpdf_color.cpp
index 080df2fa28..26db5dec15 100644
--- a/core/fpdfapi/page/cpdf_color.cpp
+++ b/core/fpdfapi/page/cpdf_color.cpp
@@ -86,10 +86,9 @@ void CPDF_Color::SetValue(const float* comps) {
memcpy(m_pBuffer, comps, m_pCS->CountComponents() * sizeof(float));
}
-void CPDF_Color::SetValue(CPDF_Pattern* pPattern,
- const float* comps,
- uint32_t ncomps) {
- if (ncomps > kMaxPatternColorComps)
+void CPDF_Color::SetValueForPattern(CPDF_Pattern* pPattern,
+ const std::vector<float>& values) {
+ if (values.size() > kMaxPatternColorComps)
return;
if (!IsPattern()) {
@@ -104,10 +103,10 @@ void CPDF_Color::SetValue(CPDF_Pattern* pPattern,
pDocPageData = pvalue->m_pPattern->document()->GetPageData();
pDocPageData->ReleasePattern(pvalue->m_pPattern->pattern_obj());
}
- pvalue->m_nComps = ncomps;
+ pvalue->m_nComps = values.size();
pvalue->m_pPattern = pPattern;
- if (ncomps)
- memcpy(pvalue->m_Comps, comps, ncomps * sizeof(float));
+ if (!values.empty())
+ memcpy(pvalue->m_Comps, values.data(), values.size() * sizeof(float));
pvalue->m_pCountedPattern = nullptr;
if (pPattern) {