diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-03 16:03:42 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-03 16:03:42 -0700 |
| commit | 800bf5ac07305ccf9c9522c8c76f728a4fd99da5 (patch) | |
| tree | 9adfb205c88e1e074e955d7731850d36594011e1 /core/src/fxcodec/jbig2/JBig2_Segment.cpp | |
| parent | 640c395fa9b76552383ccd0c5f4668ea698089f6 (diff) | |
| download | pdfium-800bf5ac07305ccf9c9522c8c76f728a4fd99da5.tar.xz | |
Make a bunch of JBig2 classes independent of CJBig2_Object.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1319713003 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_Segment.cpp')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Segment.cpp | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.cpp b/core/src/fxcodec/jbig2/JBig2_Segment.cpp index 39e4fafaa1..7ad55f3515 100644 --- a/core/src/fxcodec/jbig2/JBig2_Segment.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Segment.cpp @@ -5,6 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "JBig2_Segment.h" + +#include "../../../include/fxcrt/fx_memory.h" + CJBig2_Segment::CJBig2_Segment() { m_dwNumber = 0; m_cFlags.c = 0; @@ -19,28 +22,22 @@ CJBig2_Segment::CJBig2_Segment() { m_Result.vd = NULL; } CJBig2_Segment::~CJBig2_Segment() { - clean(); -} -void CJBig2_Segment::clean() { - if (m_pReferred_to_segment_numbers) { - m_pModule->JBig2_Free(m_pReferred_to_segment_numbers); - } - if (m_Result.vd) { - switch (m_nResultType) { - case JBIG2_IMAGE_POINTER: - delete m_Result.im; - break; - case JBIG2_SYMBOL_DICT_POINTER: - delete m_Result.sd; - break; - case JBIG2_PATTERN_DICT_POINTER: - delete m_Result.pd; - break; - case JBIG2_HUFFMAN_TABLE_POINTER: - delete m_Result.ht; - break; - default: - m_pModule->JBig2_Free(m_Result.vd); - } + FX_Free(m_pReferred_to_segment_numbers); + + switch (m_nResultType) { + case JBIG2_IMAGE_POINTER: + delete m_Result.im; + break; + case JBIG2_SYMBOL_DICT_POINTER: + delete m_Result.sd; + break; + case JBIG2_PATTERN_DICT_POINTER: + delete m_Result.pd; + break; + case JBIG2_HUFFMAN_TABLE_POINTER: + delete m_Result.ht; + break; + default: + FX_Free(m_Result.vd); } } |