diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-16 16:22:37 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-16 16:22:37 -0700 |
| commit | c40ccaff017691b7d31e0597863bfb954aebd739 (patch) | |
| tree | 4f5f09c672393e130037826256ab182e2d2ae7f5 /core/src/fxcodec/jbig2/JBig2_HuffmanTable.h | |
| parent | a725bc9a3525256976c112b2b5a429a119cf9b69 (diff) | |
| download | pdfium-c40ccaff017691b7d31e0597863bfb954aebd739.tar.xz | |
Merge to XFA: Fix a bunch of sign mismatch warnings.
Also remove some gotos and move code into an anonymous namespace.
And then do the partial revert to avoid size_t going negative.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1356373003 .
Review URL: https://codereview.chromium.org/1400723002 .
(cherry picked from commit d03ba8d1a5928e8f3f6bd7da063b53b0bc40abfd)
(cherry picked from commit a398ca611d1925182ff6a4e8b2b43c277c364dc0)
Review URL: https://codereview.chromium.org/1406373002 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_HuffmanTable.h')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_HuffmanTable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.h b/core/src/fxcodec/jbig2/JBig2_HuffmanTable.h index 7c843cf91b..fe8294dc7e 100644 --- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.h +++ b/core/src/fxcodec/jbig2/JBig2_HuffmanTable.h @@ -14,7 +14,7 @@ class CJBig2_HuffmanTable { public: CJBig2_HuffmanTable(const JBig2TableLine* pTable, int nLines, FX_BOOL bHTOOB); - CJBig2_HuffmanTable(CJBig2_BitStream* pStream); + explicit CJBig2_HuffmanTable(CJBig2_BitStream* pStream); ~CJBig2_HuffmanTable(); @@ -24,13 +24,13 @@ class CJBig2_HuffmanTable { int parseFromCodedBuffer(CJBig2_BitStream* pStream); - FX_BOOL isOK() { return m_bOK; } + FX_BOOL isOK() const { return m_bOK; } private: void init(); FX_BOOL HTOOB; - int NTEMP; + FX_DWORD NTEMP; int* CODES; int* PREFLEN; int* RANGELEN; |