diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-31 15:18:28 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-31 22:49:33 +0000 |
| commit | fc04f41200e4ba4f47f52f188708547e8a1bee6d (patch) | |
| tree | 93e09a89b3dac5a3801be2e0820bc77adecd8f60 /core/fxcodec/codec/ccodec_progressivedecoder.h | |
| parent | d9dc962586d17ab113f1ad3abefc0fa2758c9d26 (diff) | |
| download | pdfium-fc04f41200e4ba4f47f52f188708547e8a1bee6d.tar.xz | |
Move all of ccodec_bmpmodule state to its context
This avoids a stale delegate pointer issue in the module. In theory,
it should also allow for multiple decodes at the same time from
different contexts within the same module, but this isn't used.
Rename associated context, and use |new| to create it. Along the
way, resolve a subtle FX_Alloc() vs. user-supplied callback
free() issue, and remove supporting code.
Bug: 728323
Change-Id: I7bb66bb5d5b4fa173bec2b445a8e71ab691fdf5c
Reviewed-on: https://pdfium-review.googlesource.com/6133
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_progressivedecoder.h')
| -rw-r--r-- | core/fxcodec/codec/ccodec_progressivedecoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index 42d0ee3aba..f9a67ccee3 100644 --- a/core/fxcodec/codec/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -134,7 +134,7 @@ class CCodec_ProgressiveDecoder : public CCodec_BmpModule::Delegate, FXJPEG_Context* m_pJpegContext; FXPNG_Context* m_pPngContext; std::unique_ptr<CGifContext> m_pGifContext; - FXBMP_Context* m_pBmpContext; + CCodec_BmpModule::Context* m_pBmpContext; CFX_UnownedPtr<CCodec_TiffContext> m_pTiffContext; FXCODEC_IMAGE_TYPE m_imagType; uint32_t m_offSet; |