diff options
author | Wei Li <weili@chromium.org> | 2016-03-10 12:35:07 -0800 |
---|---|---|
committer | Wei Li <weili@chromium.org> | 2016-03-10 12:35:07 -0800 |
commit | 79fcb5f6fa61967517566100415972848edefd24 (patch) | |
tree | 314016e327303cd3e4e3da06dd1789b79ecbf352 /core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | |
parent | 2852ce07c4e5b1053420cbf375e098e09faf679c (diff) | |
download | pdfium-79fcb5f6fa61967517566100415972848edefd24.tar.xz |
Change colorspace's number of components to be unsigned
Also remove unnecessary casts.
BUG=pdfium:29
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1783933002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 709733c56f..72472ef8fb 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -709,7 +709,7 @@ void CPDF_DIBSource::LoadJpxBitmap() { FX_BOOL bSwapRGB = FALSE; if (m_pColorSpace) { - if (components != (FX_DWORD)m_pColorSpace->CountComponents()) + if (components != m_pColorSpace->CountComponents()) return; if (m_pColorSpace == CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB)) { @@ -776,7 +776,7 @@ CPDF_DIBSource* CPDF_DIBSource::LoadMask(FX_DWORD& MatteColor) { if (pSoftMask) { CPDF_Array* pMatte = pSoftMask->GetDict()->GetArrayBy("Matte"); if (pMatte && m_pColorSpace && - (FX_DWORD)m_pColorSpace->CountComponents() <= m_nComponents) { + m_pColorSpace->CountComponents() <= m_nComponents) { std::vector<FX_FLOAT> colors(m_nComponents); for (FX_DWORD i = 0; i < m_nComponents; i++) { colors[i] = pMatte->GetFloatAt(i); @@ -801,7 +801,7 @@ int CPDF_DIBSource::StratLoadMask() { if (m_pMaskStream) { CPDF_Array* pMatte = m_pMaskStream->GetDict()->GetArrayBy("Matte"); if (pMatte && m_pColorSpace && - (FX_DWORD)m_pColorSpace->CountComponents() <= m_nComponents) { + m_pColorSpace->CountComponents() <= m_nComponents) { FX_FLOAT R, G, B; std::vector<FX_FLOAT> colors(m_nComponents); for (FX_DWORD i = 0; i < m_nComponents; i++) { |