Remove CJBig2_Object, CJBig2_Module, and friends.

core/src/fxcodec/jbig2/JBig2_Image.h

Index: core/src/fxcodec/jbig2/JBig2_Image.h
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.h b/core/src/fxcodec/jbig2/JBig2_Image.h
index c5d27f36b5210ab1c4066ff688a4e8ff43e2144e..e77da9059cb41fddfc0e8bf3c30037f1813c5873 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.h
+++ b/core/src/fxcodec/jbig2/JBig2_Image.h
@@ -6,17 +6,19 @@
 
 #ifndef _JBIG2_IMAGE_H_
 #define _JBIG2_IMAGE_H_
+
 #include "JBig2_Define.h"
-#include "JBig2_Module.h"
-typedef enum {
+
+enum JBig2ComposeOp {
   JBIG2_COMPOSE_OR = 0,
   JBIG2_COMPOSE_AND = 1,
   JBIG2_COMPOSE_XOR = 2,
   JBIG2_COMPOSE_XNOR = 3,
   JBIG2_COMPOSE_REPLACE = 4
-} JBig2ComposeOp;
+};
+
 struct FX_RECT;
-class CJBig2_Image : public CJBig2_Object {
+class CJBig2_Image {
  public:
   CJBig2_Image(int32_t w, int32_t h);