FX Bool considered harmful, part 3

core/src/fxcodec/jbig2/JBig2_Context.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <map>
 #include <list>
 #include "JBig2_Context.h"
 
@@ skipping 29 matching lines @@
                     JBIG2_EMBED_STREAM, pSymbolDictCache, pPause));
     } else {
         m_pGlobalContext = NULL;
     }
     JBIG2_ALLOC(m_pStream, CJBig2_BitStream(pData, dwLength));
     m_nStreamType = nStreamType;
     m_nState = JBIG2_OUT_OF_PAGE;
     JBIG2_ALLOC(m_pSegmentList, CJBig2_List<CJBig2_Segment>);
     JBIG2_ALLOC(m_pPageInfoList, CJBig2_List<JBig2PageInfo>(1));
     m_pPage = NULL;
-    m_bBufSpecified = FALSE;
+    m_bBufSpecified = false;
     m_pPause = pPause;
     m_nSegmentDecoded = 0;
     m_PauseStep = 10;
     m_pArithDecoder = NULL;
     m_pGRD = NULL;
     m_gbContext = NULL;
     m_pSegment = NULL;
     m_dwOffset = 0;
     m_ProcessiveStatus = FXCODEC_STATUS_FRAME_READY;
     m_pSymbolDictCache = pSymbolDictCache;
@@ skipping 163 matching lines @@
 int32_t CJBig2_Context::getFirstPage(uint8_t *pBuf, int32_t width, int32_t height, int32_t stride, IFX_Pause* pPause)
 {
     int32_t nRet = 0;
     if(m_pGlobalContext) {
         nRet = m_pGlobalContext->decode_EmbedOrgnazation(pPause);
         if(nRet != JBIG2_SUCCESS) {
             m_ProcessiveStatus = FXCODEC_STATUS_ERROR;
             return nRet;
         }
     }
-    m_bFirstPage = TRUE;
+    m_bFirstPage = true;
     m_PauseStep = 0;
     delete m_pPage;
     JBIG2_ALLOC(m_pPage, CJBig2_Image(width, height, stride, pBuf));
-    m_bBufSpecified = TRUE;
+    m_bBufSpecified = true;
     if(m_pPage && pPause && pPause->NeedToPauseNow()) {
         m_PauseStep = 1;
         m_ProcessiveStatus = FXCODEC_STATUS_DECODE_TOBECONTINUE;
         return nRet;
     }
     int ret = Continue(pPause);
     return ret;
 }
 int32_t CJBig2_Context::Continue(IFX_Pause* pPause)
 {
@@ skipping 42 matching lines @@
     if(nRet == JBIG2_SUCCESS) {
         m_ProcessiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     } else {
         m_ProcessiveStatus = FXCODEC_STATUS_ERROR;
     }
     return nRet;
 }
 int32_t CJBig2_Context::getNextPage(uint8_t *pBuf, int32_t width, int32_t height, int32_t stride, IFX_Pause* pPause)
 {
     int32_t nRet = JBIG2_ERROR_STREAM_TYPE;
-    m_bFirstPage = FALSE;
+    m_bFirstPage = false;
     m_PauseStep = 0;
     delete m_pPage;
     JBIG2_ALLOC(m_pPage, CJBig2_Image(width, height, stride, pBuf));
-    m_bBufSpecified = TRUE;
+    m_bBufSpecified = true;
     if(m_pPage && pPause && pPause->NeedToPauseNow()) {
         m_PauseStep = 1;
         m_ProcessiveStatus = FXCODEC_STATUS_DECODE_TOBECONTINUE;
         return nRet;
     }
     return Continue(pPause);
     switch(m_nStreamType) {
         case JBIG2_FILE_STREAM:
             nRet = decodeFile(pPause);
             break;
         case JBIG2_SQUENTIAL_STREAM:
             nRet = decode_SquentialOrgnazation(pPause);
             break;
         case JBIG2_RANDOM_STREAM:
             nRet = decode_RandomOrgnazation(pPause);
             break;
         case JBIG2_EMBED_STREAM:
             nRet = decode_EmbedOrgnazation(pPause);
             break;
         default:
             return JBIG2_ERROR_STREAM_TYPE;
     }
     return nRet;
 }
 int32_t CJBig2_Context::getFirstPage(CJBig2_Image **image, IFX_Pause* pPause)
 {
     int32_t nRet;
-    m_bFirstPage = TRUE;
+    m_bFirstPage = true;
     m_PauseStep = 0;
     if(m_pGlobalContext) {
         nRet = m_pGlobalContext->decode_EmbedOrgnazation(pPause);
         if(nRet != JBIG2_SUCCESS) {
             return nRet;
         }
     }
-    m_bBufSpecified = FALSE;
+    m_bBufSpecified = false;
     return Continue(pPause);
 }
 int32_t CJBig2_Context::getNextPage(CJBig2_Image **image, IFX_Pause* pPause)
 {
     int32_t nRet;
-    m_bBufSpecified = FALSE;
-    m_bFirstPage = FALSE;
+    m_bBufSpecified = false;
+    m_bFirstPage = false;
     m_PauseStep = 0;
     switch(m_nStreamType) {
         case JBIG2_FILE_STREAM:
             nRet = decodeFile(pPause);
             break;
         case JBIG2_SQUENTIAL_STREAM:
             nRet = decode_SquentialOrgnazation(pPause);
             break;
         case JBIG2_RANDOM_STREAM:
             nRet = decode_RandomOrgnazation(pPause);
@@ skipping 235 matching lines @@
     return JBIG2_ERROR_FATAL;
 }
 int32_t CJBig2_Context::parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pPause)
 {
     FX_DWORD dwTemp;
     FX_WORD wFlags;
     uint8_t cSDHUFFDH, cSDHUFFDW, cSDHUFFBMSIZE, cSDHUFFAGGINST;
     CJBig2_HuffmanTable *Table_B1 = NULL, *Table_B2 = NULL, *Table_B3 = NULL, *Table_B4 = NULL, *Table_B5 = NULL;
     int32_t i, nIndex, nRet;
     CJBig2_Segment *pSeg = NULL, *pLRSeg = NULL;
-    FX_BOOL bUsed;
+    bool bUsed;
     CJBig2_Image ** SDINSYMS = NULL;
     CJBig2_SDDProc *pSymbolDictDecoder;
     JBig2ArithCtx *gbContext = NULL, *grContext = NULL;
     CJBig2_ArithDecoder *pArithDecoder;
     JBIG2_ALLOC(pSymbolDictDecoder, CJBig2_SDDProc());
     uint8_t *key = pSegment->m_pData;
-    FX_BOOL cache_hit = false;
+    bool cache_hit = false;
     if(m_pStream->readShortInteger(&wFlags) != 0) {
         m_pModule->JBig2_Error("symbol dictionary segment : data header too short.");
         nRet = JBIG2_ERROR_TOO_SHORT;
         goto failed;
     }
     pSymbolDictDecoder->SDHUFF = wFlags & 0x0001;
     pSymbolDictDecoder->SDREFAGG = (wFlags >> 1) & 0x0001;
     pSymbolDictDecoder->SDTEMPLATE = (wFlags >> 10) & 0x0003;
     pSymbolDictDecoder->SDRTEMPLATE = (wFlags >> 12) & 0x0003;
     cSDHUFFDH = (wFlags >> 2) & 0x0003;
@@ skipping 196 matching lines @@
         CJBig2_SymbolDict *value = pSegment->m_Result.sd->DeepCopy();
         if (value && kSymbolDictCacheMaxSize > 0) {
             while (m_pSymbolDictCache->size() >= kSymbolDictCacheMaxSize) {
                 delete m_pSymbolDictCache->back().second;
                 m_pSymbolDictCache->pop_back();
             }
             m_pSymbolDictCache->push_front(CJBig2_CachePair(key, value));
         }
     }
     if(wFlags & 0x0200) {
-        pSegment->m_Result.sd->m_bContextRetained = TRUE;
+        pSegment->m_Result.sd->m_bContextRetained = true;
         if(pSymbolDictDecoder->SDHUFF == 0) {
             pSegment->m_Result.sd->m_gbContext = gbContext;
         }
         if(pSymbolDictDecoder->SDREFAGG == 1) {
             pSegment->m_Result.sd->m_grContext = grContext;
         }
-        bUsed = TRUE;
+        bUsed = true;
     } else {
-        bUsed = FALSE;
+        bUsed = false;
     }
     delete pSymbolDictDecoder;
     if(SDINSYMS) {
         m_pModule->JBig2_Free(SDINSYMS);
     }
     delete Table_B1;
     delete Table_B2;
     delete Table_B3;
     delete Table_B4;
     delete Table_B5;
-    if(bUsed == FALSE) {
+    if(bUsed == false) {
         if(gbContext) {
             m_pModule->JBig2_Free(gbContext);
         }
         if(grContext) {
             m_pModule->JBig2_Free(grContext);
         }
     }
     return JBIG2_SUCCESS;
 failed:
     delete pSymbolDictDecoder;
@@ skipping 901 matching lines @@
                 SBSYMCODES[CURTEMP].code = CURCODE;
                 CURCODE = CURCODE + 1;
             }
             CURTEMP = CURTEMP + 1;
         }
         CURLEN = CURLEN + 1;
     }
     m_pModule->JBig2_Free(LENCOUNT);
     m_pModule->JBig2_Free(FIRSTCODE);
 }