Remove CJBig2_Object, CJBig2_Module, and friends.

core/src/fxcodec/codec/fx_codec_jbig.cpp

Index: core/src/fxcodec/codec/fx_codec_jbig.cpp
diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/src/fxcodec/codec/fx_codec_jbig.cpp
index b95461b3e57bc60686a2d0b6ee97ed0627f58aea..310627a0a84c06310b117ae63a55ac7fbc0acfb6 100644
--- a/core/src/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp
@@ -48,8 +48,8 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode(void* pJbig2Context,
   m_pJbig2Context->m_bFileReader = FALSE;
   FXSYS_memset(dest_buf, 0, height * dest_pitch);
   m_pJbig2Context->m_pContext = CJBig2_Context::CreateContext(
-      &m_Module, (uint8_t*)global_data, global_size, (uint8_t*)src_buf,
-      src_size, JBIG2_EMBED_STREAM, &m_SymbolDictCache, pPause);
+      (uint8_t*)global_data, global_size, (uint8_t*)src_buf, src_size,
+      JBIG2_EMBED_STREAM, &m_SymbolDictCache, pPause);

[Tom Sepez, 2015/09/09 18:10:56]

For next time: global_data and src_buf are already uint8_t*, const-qualified
versions.  Casts are thus either unneeded, or const_casts, in which case the
right thing is to make some const untangling ...

[Lei Zhang, 2015/09/09 22:49:05]

I removed the cast and fixed all the consts in patch set 4.

   if (!m_pJbig2Context->m_pContext) {
     return FXCODEC_STATUS_ERROR;
   }