1 files changed, 12 insertions, 12 deletions

diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp
index b2fcca869b..46e2cf8f65 100644
--- a/core/fxcodec/codec/ccodec_bmpmodule.cpp
+++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp
@@ -27,7 +27,7 @@ CCodec_BmpModule::~CCodec_BmpModule() {}
 std::unique_ptr<CCodec_BmpModule::Context> CCodec_BmpModule::Start(
     Delegate* pDelegate) {
   auto p = pdfium::MakeUnique<CBmpContext>(this, pDelegate);
-  p->m_Bmp.context_ptr = p.get();
+  p->m_Bmp.context_ptr_ = p.get();
   return p;
 }
 
@@ -40,31 +40,31 @@ int32_t CCodec_BmpModule::ReadHeader(Context* pContext,
                                      std::vector<uint32_t>* palette,
                                      CFX_DIBAttribute* pAttribute) {
   auto* ctx = static_cast<CBmpContext*>(pContext);
-  if (setjmp(ctx->m_Bmp.jmpbuf))
+  if (setjmp(ctx->m_Bmp.jmpbuf_))
     return 0;
 
   int32_t ret = ctx->m_Bmp.ReadHeader();
   if (ret != 1)
     return ret;
 
-  *width = ctx->m_Bmp.width;
-  *height = ctx->m_Bmp.height;
-  *tb_flag = ctx->m_Bmp.imgTB_flag;
-  *components = ctx->m_Bmp.components;
-  *pal_num = ctx->m_Bmp.pal_num;
-  *palette = ctx->m_Bmp.palette;
+  *width = ctx->m_Bmp.width_;
+  *height = ctx->m_Bmp.height_;
+  *tb_flag = ctx->m_Bmp.imgTB_flag_;
+  *components = ctx->m_Bmp.components_;
+  *pal_num = ctx->m_Bmp.pal_num_;
+  *palette = ctx->m_Bmp.palette_;
   if (pAttribute) {
     pAttribute->m_wDPIUnit = FXCODEC_RESUNIT_METER;
-    pAttribute->m_nXDPI = ctx->m_Bmp.dpi_x;
-    pAttribute->m_nYDPI = ctx->m_Bmp.dpi_y;
-    pAttribute->m_nBmpCompressType = ctx->m_Bmp.compress_flag;
+    pAttribute->m_nXDPI = ctx->m_Bmp.dpi_x_;
+    pAttribute->m_nYDPI = ctx->m_Bmp.dpi_y_;
+    pAttribute->m_nBmpCompressType = ctx->m_Bmp.compress_flag_;
   }
   return 1;
 }
 
 int32_t CCodec_BmpModule::LoadImage(Context* pContext) {
   auto* ctx = static_cast<CBmpContext*>(pContext);
-  if (setjmp(ctx->m_Bmp.jmpbuf))
+  if (setjmp(ctx->m_Bmp.jmpbuf_))
     return 0;
 
   return ctx->m_Bmp.DecodeImage();