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_page | |
| 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_page')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index a43aff18cb..058cbe77d4 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -36,7 +36,7 @@ void sRGB_to_AdobeCMYK(FX_FLOAT R, } } -int ComponentsForFamily(int family) { +FX_DWORD ComponentsForFamily(int family) { if (family == PDFCS_DEVICERGB) return 3; if (family == PDFCS_DEVICEGRAY) diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp index f7c3f7d8d3..7e8b2e525b 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -173,7 +173,7 @@ FX_BOOL CPDF_MeshStream::Load(CPDF_Stream* pShadingStream, if (!m_nCoordBits || !m_nCompBits) { return FALSE; } - int nComps = pCS->CountComponents(); + FX_DWORD nComps = pCS->CountComponents(); if (nComps > 8) { return FALSE; } diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 030e734edd..517c0a4055 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -396,12 +396,12 @@ class CPDF_IccProfile { public: CPDF_IccProfile(const uint8_t* pData, FX_DWORD dwSize); ~CPDF_IccProfile(); - int32_t GetComponents() const { return m_nSrcComponents; } + FX_DWORD GetComponents() const { return m_nSrcComponents; } FX_BOOL m_bsRGB; void* m_pTransform; private: - int32_t m_nSrcComponents; + FX_DWORD m_nSrcComponents; }; class CPDF_DeviceCS : public CPDF_ColorSpace { |