diff options
author | Lei Zhang <thestig@chromium.org> | 2018-04-12 17:56:35 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-12 17:56:35 +0000 |
commit | 6998bc502dd2798115024c48b95e6e9180b2b3ee (patch) | |
tree | 5a666d322c0ce76738bf905d06da7235e1edec83 /core/fpdfapi/page/cpdf_function.cpp | |
parent | a8db06a715cd0090a8c838a7b2861ca3c657f6a2 (diff) | |
download | pdfium-6998bc502dd2798115024c48b95e6e9180b2b3ee.tar.xz |
Make the input data to CPDF_ColorSpace::GetRGB() const.
Make a copy of the input data when clamping it in CPDF_Function::Call().
Change-Id: I1d2b3d080977f0f9a4c3ccaf111780867668991a
Reviewed-on: https://pdfium-review.googlesource.com/30350
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_function.cpp')
-rw-r--r-- | core/fpdfapi/page/cpdf_function.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/fpdfapi/page/cpdf_function.cpp b/core/fpdfapi/page/cpdf_function.cpp index 3e99eb8176..bf5c3e065f 100644 --- a/core/fpdfapi/page/cpdf_function.cpp +++ b/core/fpdfapi/page/cpdf_function.cpp @@ -6,6 +6,8 @@ #include "core/fpdfapi/page/cpdf_function.h" +#include <vector> + #include "core/fpdfapi/page/cpdf_expintfunc.h" #include "core/fpdfapi/page/cpdf_psfunc.h" #include "core/fpdfapi/page/cpdf_sampledfunc.h" @@ -113,7 +115,7 @@ bool CPDF_Function::Init(CPDF_Object* pObj, std::set<CPDF_Object*>* pVisited) { return true; } -bool CPDF_Function::Call(float* inputs, +bool CPDF_Function::Call(const float* inputs, uint32_t ninputs, float* results, int* nresults) const { @@ -121,11 +123,12 @@ bool CPDF_Function::Call(float* inputs, return false; *nresults = m_nOutputs; + std::vector<float> clamped_inputs(m_nInputs); for (uint32_t i = 0; i < m_nInputs; i++) { - inputs[i] = + clamped_inputs[i] = pdfium::clamp(inputs[i], m_pDomains[i * 2], m_pDomains[i * 2 + 1]); } - v_Call(inputs, results); + v_Call(clamped_inputs.data(), results); if (!m_pRanges) return true; |