diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-28 14:21:09 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-28 14:21:09 -0700 |
| commit | 1e87d8a58b638bb3fd5f9683f06b74e13e9533a2 (patch) | |
| tree | dd57e9035254025fc5e7b1e2ce9001053b3c5250 /core/src/fpdfapi/fpdf_parser | |
| parent | bd7fabf61f41e5ac2ded12ac46a4193c3dbffc44 (diff) | |
| download | pdfium-1e87d8a58b638bb3fd5f9683f06b74e13e9533a2.tar.xz | |
Merge to XFA: Cleanup some fx_codec_fax.cpp code.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1367633005 .
(cherry picked from commit 39cd934a4705f69c30e1bbf13eab347f66999020)
Review URL: https://codereview.chromium.org/1370273002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp index 8cb432029c..28f95adf31 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp @@ -846,18 +846,7 @@ void CPDF_FaxFilter::v_FilterFinish(CFX_BinaryBuf& dest_buf) { ProcessData(m_InputBuf.GetBuffer(), m_InputBuf.GetSize(), m_InputBitPos, TRUE, dest_buf); } -FX_BOOL _FaxSkipEOL(const uint8_t* src_buf, int bitsize, int& bitpos); -FX_BOOL _FaxG4GetRow(const uint8_t* src_buf, - int bitsize, - int& bitpos, - uint8_t* dest_buf, - const uint8_t* ref_buf, - int columns); -FX_BOOL _FaxGet1DLine(const uint8_t* src_buf, - int bitsize, - int& bitpos, - uint8_t* dest_buf, - int columns); + void CPDF_FaxFilter::ProcessData(const uint8_t* src_buf, FX_DWORD src_size, int& bitpos, @@ -893,15 +882,15 @@ void CPDF_FaxFilter::ProcessData(const uint8_t* src_buf, FX_BOOL CPDF_FaxFilter::ReadLine(const uint8_t* src_buf, int bitsize, int& bitpos) { - if (!_FaxSkipEOL(src_buf, bitsize, bitpos)) { + if (!FaxSkipEOL(src_buf, bitsize, bitpos)) { return FALSE; } FX_BOOL ret; if (m_Encoding < 0) { - ret = _FaxG4GetRow(src_buf, bitsize, bitpos, m_pScanlineBuf, m_pRefBuf, - m_nColumns); + ret = FaxG4GetRow(src_buf, bitsize, bitpos, m_pScanlineBuf, m_pRefBuf, + m_nColumns); } else if (m_Encoding == 0) { - ret = _FaxGet1DLine(src_buf, bitsize, bitpos, m_pScanlineBuf, m_nColumns); + ret = FaxGet1DLine(src_buf, bitsize, bitpos, m_pScanlineBuf, m_nColumns); } else { if (bitpos == bitsize) { return FALSE; @@ -909,17 +898,17 @@ FX_BOOL CPDF_FaxFilter::ReadLine(const uint8_t* src_buf, FX_BOOL bNext1D = src_buf[bitpos / 8] & (1 << (7 - bitpos % 8)); bitpos++; if (bNext1D) { - ret = _FaxGet1DLine(src_buf, bitsize, bitpos, m_pScanlineBuf, m_nColumns); + ret = FaxGet1DLine(src_buf, bitsize, bitpos, m_pScanlineBuf, m_nColumns); } else { - ret = _FaxG4GetRow(src_buf, bitsize, bitpos, m_pScanlineBuf, m_pRefBuf, - m_nColumns); + ret = FaxG4GetRow(src_buf, bitsize, bitpos, m_pScanlineBuf, m_pRefBuf, + m_nColumns); } } if (!ret) { return FALSE; } if (m_bEndOfLine) - if (!_FaxSkipEOL(src_buf, bitsize, bitpos)) { + if (!FaxSkipEOL(src_buf, bitsize, bitpos)) { return FALSE; } if (m_bByteAlign) { |