diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-08 15:14:24 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-08 15:14:24 -0700 |
| commit | 921cc2403a9e643dfb29d70564fa435a1d79f972 (patch) | |
| tree | 005543a896eb07b52a416abc2bc681d286fc24db /core/src/fxcodec/jbig2/JBig2_Segment.cpp | |
| parent | d1cb813d23df38a8e21df3314658995ded7c4b45 (diff) | |
| download | pdfium-921cc2403a9e643dfb29d70564fa435a1d79f972.tar.xz | |
Merge to XFA: Various changes to JBig2 cache:
- Makes the cache be per-document
- Keys the cache on ObjNum and stream offset instead of keying on a pointer to the data (which can result in false cache hits).
- Makes it so the cache is only used for the globals stream.
- Reenable the cache.
R=dml@google.com
TBR=dml@google.com
BUG=pdfium:207
Review URL: https://codereview.chromium.org/1380243004 .
(cherry picked from commit f1b88e76134808f36f16b9e53a2e9dd89b12c8fd)
Review URL: https://codereview.chromium.org/1394373002 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_Segment.cpp')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Segment.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.cpp b/core/src/fxcodec/jbig2/JBig2_Segment.cpp index 7ad55f3515..1b0d4e9303 100644 --- a/core/src/fxcodec/jbig2/JBig2_Segment.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Segment.cpp @@ -16,7 +16,8 @@ CJBig2_Segment::CJBig2_Segment() { m_dwPage_association = 0; m_dwData_length = 0; m_dwHeader_Length = 0; - m_pData = NULL; + m_dwObjNum = 0; + m_dwDataOffset = 0; m_State = JBIG2_SEGMENT_HEADER_UNPARSED; m_nResultType = JBIG2_VOID_POINTER; m_Result.vd = NULL; |