diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-02-27 19:49:57 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-02-27 19:49:57 -0800 |
| commit | 659b8d3a3de770f8dc0e0334bda9748301403bae (patch) | |
| tree | 9680123aaa4f3836f79b227c8e7395bbfa3f8a74 /core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | |
| parent | 6ebc7515e1e6a75c5aa8c16fc7a1250fc58f44f2 (diff) | |
| download | pdfium-659b8d3a3de770f8dc0e0334bda9748301403bae.tar.xz | |
Merge to XFA: Cleanup: Get rid of CRLF line endings.
Original URL: https://codereview.chromium.org/837533003
(cherry picked from commit 256ef88a26cff56fc7c23119d2d9e1b41468bd1a)
Review URL: https://codereview.chromium.org/963403002
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 670465673b..86db177ad7 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -519,8 +519,8 @@ void CPDF_LabCS::TranslateImageLine(FX_LPBYTE pDestBuf, FX_LPCBYTE pSrcBuf, int } } CPDF_IccProfile::CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize): - m_bsRGB(FALSE),
- m_pTransform(NULL),
+ m_bsRGB(FALSE), + m_pTransform(NULL), m_nSrcComponents(0) { if (dwSize == 3144 && FXSYS_memcmp32(pData + 0x190, "sRGB IEC61966-2.1", 17) == 0) { @@ -1376,13 +1376,13 @@ void CPDF_Color::SetValue(CPDF_Pattern* pPattern, FX_FLOAT* comps, int ncomps) if (ncomps) { FXSYS_memcpy32(pvalue->m_Comps, comps, ncomps * sizeof(FX_FLOAT)); } - pvalue->m_pCountedPattern = NULL;
- if (pPattern && pPattern->m_pDocument)
- {
- if (!pDocPageData) {
- pDocPageData = pPattern->m_pDocument->GetPageData();
- }
- pvalue->m_pCountedPattern = pDocPageData->FindPatternPtr(pPattern->m_pPatternObj);
+ pvalue->m_pCountedPattern = NULL; + if (pPattern && pPattern->m_pDocument) + { + if (!pDocPageData) { + pDocPageData = pPattern->m_pDocument->GetPageData(); + } + pvalue->m_pCountedPattern = pDocPageData->FindPatternPtr(pPattern->m_pPatternObj); } } void CPDF_Color::Copy(const CPDF_Color* pSrc) |