Replace void* to actual type for jbig2 context to avoid casts

Also clear up a few variable names and unnecessary brackets.

Review-Url: https://codereview.chromium.org/2143083002

1 files changed, 24 insertions, 4 deletions

diff --git a/core/fxcodec/codec/ccodec_jbig2module.h b/core/fxcodec/codec/ccodec_jbig2module.h
index a967e0b997..63e63afcfa 100644
--- a/core/fxcodec/codec/ccodec_jbig2module.h
+++ b/core/fxcodec/codec/ccodec_jbig2module.h
@@ -9,18 +9,37 @@
 
 #include <memory>
 
+#include "core/fxcodec/include/fx_codec_def.h"
 #include "core/fxcrt/include/fx_basic.h"
 
+class CJBig2_Context;
+class CJBig2_Image;
 class CPDF_StreamAcc;
 class IFX_Pause;
 
+class CCodec_Jbig2Context {
+ public:
+  CCodec_Jbig2Context();
+  ~CCodec_Jbig2Context() {}
+
+  uint32_t m_width;
+  uint32_t m_height;
+  CPDF_StreamAcc* m_pGlobalStream;
+  CPDF_StreamAcc* m_pSrcStream;
+  uint8_t* m_dest_buf;
+  uint32_t m_dest_pitch;
+  IFX_Pause* m_pPause;
+  CJBig2_Context* m_pContext;
+  CJBig2_Image* m_dest_image;
+};
+
 class CCodec_Jbig2Module {
  public:
   CCodec_Jbig2Module() {}
   ~CCodec_Jbig2Module();
 
-  void* CreateJbig2Context();
-  FXCODEC_STATUS StartDecode(void* pJbig2Context,
+  CCodec_Jbig2Context* CreateJbig2Context();
+  FXCODEC_STATUS StartDecode(CCodec_Jbig2Context* pJbig2Context,
                              std::unique_ptr<CFX_Deletable>* pContextHolder,
                              uint32_t width,
                              uint32_t height,
@@ -29,8 +48,9 @@ class CCodec_Jbig2Module {
                              uint8_t* dest_buf,
                              uint32_t dest_pitch,
                              IFX_Pause* pPause);
-  FXCODEC_STATUS ContinueDecode(void* pJbig2Context, IFX_Pause* pPause);
-  void DestroyJbig2Context(void* pJbig2Context);
+  FXCODEC_STATUS ContinueDecode(CCodec_Jbig2Context* pJbig2Context,
+                                IFX_Pause* pPause);
+  void DestroyJbig2Context(CCodec_Jbig2Context* pJbig2Context);
 };
 
 #endif  // CORE_FXCODEC_CODEC_CCODEC_JBIG2MODULE_H_