diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-06-22 14:23:52 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-06-22 18:56:36 +0000 |
| commit | b32a949d667600cb33e80e1bb8c97a23d96f27d9 (patch) | |
| tree | 756bd8fa5190925421a88e699f39889be7903ec6 /core/fxcodec/codec/ccodec_bmpmodule.cpp | |
| parent | 84d8eb9b6fdd2afd43f5970b3544d63aa990d30e (diff) | |
| download | pdfium-b32a949d667600cb33e80e1bb8c97a23d96f27d9.tar.xz | |
Continue BMP decoder cleanup
This CL replaces raw pointers with vector and unique_ptr. It also fixes
other nits.
Change-Id: I45c99c9aa658681ec3f0b48fc4f407b278b250f5
Reviewed-on: https://pdfium-review.googlesource.com/6830
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_bmpmodule.cpp')
| -rw-r--r-- | core/fxcodec/codec/ccodec_bmpmodule.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp index 1c8112498c..a64e6783e1 100644 --- a/core/fxcodec/codec/ccodec_bmpmodule.cpp +++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp @@ -39,7 +39,7 @@ int32_t CCodec_BmpModule::ReadHeader(Context* pContext, bool* tb_flag, int32_t* components, int32_t* pal_num, - uint32_t** pal_pp, + std::vector<uint32_t>* palette, CFX_DIBAttribute* pAttribute) { auto* ctx = static_cast<CBmpContext*>(pContext); if (setjmp(ctx->m_Bmp.jmpbuf)) @@ -54,7 +54,7 @@ int32_t CCodec_BmpModule::ReadHeader(Context* pContext, *tb_flag = ctx->m_Bmp.imgTB_flag; *components = ctx->m_Bmp.components; *pal_num = ctx->m_Bmp.pal_num; - *pal_pp = ctx->m_Bmp.pal_ptr; + *palette = ctx->m_Bmp.palette; if (pAttribute) { pAttribute->m_wDPIUnit = FXCODEC_RESUNIT_METER; pAttribute->m_nXDPI = ctx->m_Bmp.dpi_x; |