Cleanup JBig2_ArithIntDecoder.

core/src/fxcodec/jbig2/JBig2_SddProc.cpp

Index: core/src/fxcodec/jbig2/JBig2_SddProc.cpp
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
index ae5635b462d30aaf6f4e3d4427699cc17cc48fff..924d25e3c430150e373ed50a7b8a2a893b45663d 100644
--- a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp
@@ -65,7 +65,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith(
   NSYMSDECODED = 0;
   while (NSYMSDECODED < SDNUMNEWSYMS) {
     BS = nullptr;
-    if (IADH->decode(pArithDecoder, &HCDH) == -1) {
+    if (!IADH->decode(pArithDecoder, &HCDH)) {
       goto failed;
     }
     HCHEIGHT = HCHEIGHT + HCDH;
@@ -116,7 +116,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith(
           goto failed;
         }
       } else {
-        if (IAAI->decode(pArithDecoder, (int*)&REFAGGNINST) == -1) {
+        if (!IAAI->decode(pArithDecoder, (int*)&REFAGGNINST)) {
           goto failed;
         }
         if (REFAGGNINST > 1) {
@@ -209,11 +209,9 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith(
           FX_Free(SBSYMS);
         } else if (REFAGGNINST == 1) {
           SBNUMSYMS = SDNUMINSYMS + NSYMSDECODED;
-          if (IAID->decode(pArithDecoder, (int*)&IDI) == -1) {
-            goto failed;
-          }
-          if ((IARDX->decode(pArithDecoder, &RDXI) == -1) ||
-              (IARDY->decode(pArithDecoder, &RDYI) == -1)) {
+          IAID->decode(pArithDecoder, reinterpret_cast<int*>(&IDI));

[Tom Sepez, 2015/09/29 17:46:36]

Technically, an illegal cast, since there's no reason to believe an FX_DWORD and
an int are related in any manner.  Can we change the out parameter type to match
and lose the cast?

[Lei Zhang, 2015/09/30 05:12:19]

Done.

+          if (!IARDX->decode(pArithDecoder, &RDXI) ||
+              !IARDY->decode(pArithDecoder, &RDYI)) {
             goto failed;
           }
           if (IDI >= SBNUMSYMS) {
@@ -256,7 +254,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith(
   CUREXFLAG = 0;
   EXFLAGS = FX_Alloc(FX_BOOL, SDNUMINSYMS + SDNUMNEWSYMS);
   while (EXINDEX < SDNUMINSYMS + SDNUMNEWSYMS) {
-    if (IAEX->decode(pArithDecoder, (int*)&EXRUNLENGTH) == -1) {
+    if (!IAEX->decode(pArithDecoder, (int*)&EXRUNLENGTH)) {
       FX_Free(EXFLAGS);
       goto failed;
     }