diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:22:13 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:22:13 -0700 |
| commit | da180e9fdd4385df024cc18046f62ca47bc74d74 (patch) | |
| tree | 931e0e64ac2cbc82e3718e43418ee6bd676da4a5 /core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | |
| parent | 2b1a2d528469cda4e9f3e36d3c7a649e0d476480 (diff) | |
| download | pdfium-da180e9fdd4385df024cc18046f62ca47bc74d74.tar.xz | |
Merge to XFA: Don't bother checking pointers before delete[] and FX_Free().
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1297713003 .
(cherry picked from commit cb62e7657b3a9a04142028a4e6614029a08e894b)
Review URL: https://codereview.chromium.org/1287053005 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index cc6c9e9d56..a3fef3df82 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -671,12 +671,8 @@ class CPDF_ICCBasedCS : public CPDF_ColorSpace { }; CPDF_ICCBasedCS::~CPDF_ICCBasedCS() { - if (m_pCache) { - FX_Free(m_pCache); - } - if (m_pRanges) { - FX_Free(m_pRanges); - } + FX_Free(m_pCache); + FX_Free(m_pRanges); if (m_pAlterCS && m_bOwn) { m_pAlterCS->ReleaseCS(); } @@ -882,9 +878,7 @@ class CPDF_IndexedCS : public CPDF_ColorSpace { FX_FLOAT* m_pCompMinMax; }; CPDF_IndexedCS::~CPDF_IndexedCS() { - if (m_pCompMinMax) { - FX_Free(m_pCompMinMax); - } + FX_Free(m_pCompMinMax); CPDF_ColorSpace* pCS = m_pCountedBaseCS ? m_pCountedBaseCS->get() : NULL; if (pCS && m_pDocument) { m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray()); @@ -1460,9 +1454,7 @@ void CPDF_Color::SetValue(CPDF_Pattern* pPattern, FX_FLOAT* comps, int ncomps) { return; } if (m_pCS == NULL || m_pCS->GetFamily() != PDFCS_PATTERN) { - if (m_pBuffer) { - FX_Free(m_pBuffer); - } + FX_Free(m_pBuffer); m_pCS = CPDF_ColorSpace::GetStockCS(PDFCS_PATTERN); m_pBuffer = m_pCS->CreateBuf(); } |