summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-04-26 09:31:15 -0400
committerdsinclair <dsinclair@chromium.org>2017-04-26 13:32:34 +0000
commit640ce01e14c2e9b7b4ee3928988ff82eb230620e (patch)
tree308767209a7a39a961f929bff5c4b731982cc0de
parent9612873a07b631d29a47abf4f8e31eadf85d7798 (diff)
downloadpdfium-640ce01e14c2e9b7b4ee3928988ff82eb230620e.tar.xz
[Merge M59] Initialize colour values
The colour values returned from the ColorSpace GetRBG methods may not have set a value. This CL updates the CPDF_MeshStream to always initialize the values to 0 so they can't be used uninitialized. TBR=tsepez@chromium.org Bug: chromium:714074 Change-Id: Id2db5eabe31d2ff19f9330b2bc5c681680cf461d Reviewed-on: https://pdfium-review.googlesource.com/4450 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org> (cherry picked from commit 302cd78d00c280cb212a5934a7a8293851e9650c) Change-Id: Ieaa639ed65c0ff8e654d6559818c32ff770d49d7 Reviewed-on: https://pdfium-review.googlesource.com/4530 Reviewed-by: dsinclair <dsinclair@chromium.org>
-rw-r--r--core/fpdfapi/page/cpdf_meshstream.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp
index c173bc633a..ac93513163 100644
--- a/core/fpdfapi/page/cpdf_meshstream.cpp
+++ b/core/fpdfapi/page/cpdf_meshstream.cpp
@@ -204,9 +204,9 @@ std::tuple<float, float, float> CPDF_MeshStream::ReadColor() {
(m_ColorMax[i] - m_ColorMin[i]) / m_ComponentMax;
}
- float r;
- float g;
- float b;
+ float r = 0.0;
+ float g = 0.0;
+ float b = 0.0;
if (m_funcs.empty()) {
m_pCS->GetRGB(color_value, &r, &g, &b);
return std::tuple<float, float, float>(r, g, b);