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/fxcodec/jbig2 | |
| 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/fxcodec/jbig2')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Define.h | 10 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_GrdProc.cpp | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h index 50516f5798..d1a19c5d61 100644 --- a/core/src/fxcodec/jbig2/JBig2_Define.h +++ b/core/src/fxcodec/jbig2/JBig2_Define.h @@ -26,16 +26,6 @@ struct JBig2HuffmanCode { int32_t code; }; -extern "C" { -void _FaxG4Decode(const uint8_t* src_buf, - FX_DWORD src_size, - int* pbitpos, - uint8_t* dest_buf, - int width, - int height, - int pitch = 0); -}; - #define JBIG2_MAX_REFERRED_SEGMENT_COUNT 64 #define JBIG2_MAX_EXPORT_SYSMBOLS 65535 #define JBIG2_MAX_NEW_SYSMBOLS 65535 diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp index 5eb0570e72..eda76bbce9 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp @@ -7,6 +7,7 @@ #include "JBig2_GrdProc.h" #include "../../../../third_party/base/nonstd_unique_ptr.h" +#include "../../../include/fxcodec/fx_codec.h" #include "JBig2_ArithDecoder.h" #include "JBig2_BitStream.h" #include "JBig2_Image.h" @@ -668,8 +669,8 @@ FXCODEC_STATUS CJBig2_GRDProc::Start_decode_MMR(CJBig2_Image** pImage, return m_ProssiveStatus; } bitpos = (int)pStream->getBitPos(); - _FaxG4Decode(pStream->getBuf(), pStream->getLength(), &bitpos, - (*pImage)->m_pData, GBW, GBH, (*pImage)->m_nStride); + FaxG4Decode(pStream->getBuf(), pStream->getLength(), &bitpos, + (*pImage)->m_pData, GBW, GBH, (*pImage)->m_nStride); pStream->setBitPos(bitpos); for (i = 0; (FX_DWORD)i < (*pImage)->m_nStride * GBH; i++) { (*pImage)->m_pData[i] = ~(*pImage)->m_pData[i]; |