Clean up fx_codec_tiff.cpp.

core/fxcodec/codec/fx_codec_progress.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 "core/fxcodec/codec/include/ccodec_progressivedecoder.h"
 
 #include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
 
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
 
 #if _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
 #undef FXCODEC_PNG_GAMMA

[Tom Sepez, 2016/06/09 17:53:16]

nit: can we do this with a #else instead of a def/undef?

[Lei Zhang, 2016/06/09 22:00:40]

Done.

 #define FXCODEC_PNG_GAMMA 1.7
 #endif
 
+namespace {
+
+void RGB2BGR(uint8_t* buffer, int width = 1) {
+  if (buffer && width > 0) {
+    uint8_t temp;
+    int i = 0;
+    int j = 0;
+    for (; i < width; i++, j += 3) {
+      temp = buffer[j];
+      buffer[j] = buffer[j + 2];
+      buffer[j + 2] = temp;
+    }
+  }
+}
+
+}  // namespace
+
 void CCodec_ProgressiveDecoder::CFXCODEC_WeightTable::Calc(int dest_len,
                                                            int dest_min,
                                                            int dest_max,
                                                            int src_len,
                                                            int src_min,
                                                            int src_max,
                                                            FX_BOOL bInterpol) {
-  if (m_pWeightTables) {
-    FX_Free(m_pWeightTables);
-  }
   double scale, base;
   scale = (FX_FLOAT)src_len / (FX_FLOAT)dest_len;
   if (dest_len < 0) {
     base = (FX_FLOAT)(src_len);
   } else {
     base = 0.0f;
   }
   m_ItemSize =
       (int)(sizeof(int) * 2 +
             sizeof(int) * (FXSYS_ceil(FXSYS_fabs((FX_FLOAT)scale)) + 1));
   m_DestMin = dest_min;
+  FX_Free(m_pWeightTables);
   m_pWeightTables = FX_Alloc(uint8_t, (dest_max - dest_min) * m_ItemSize + 4);
   if (FXSYS_fabs((FX_FLOAT)scale) < 1.0f) {
     for (int dest_pixel = dest_min; dest_pixel < dest_max; dest_pixel++) {
       PixelWeight& pixel_weights = *GetPixelWeight(dest_pixel);
       double src_pos = dest_pixel * scale + scale / 2 + base;
       if (bInterpol) {
         pixel_weights.m_SrcStart =
             (int)FXSYS_floor((FX_FLOAT)src_pos - 1.0f / 2);
         pixel_weights.m_SrcEnd = (int)FXSYS_floor((FX_FLOAT)src_pos + 1.0f / 2);
         if (pixel_weights.m_SrcStart < src_min) {
@@ skipping 60 matching lines @@
       double weight = area_start >= area_end ? 0.0f : area_end - area_start;
       if (weight == 0 && j == end_i) {
         pixel_weights.m_SrcEnd--;
         break;
       }
       pixel_weights.m_Weights[j - start_i] =
           FXSYS_round((FX_FLOAT)(weight * 65536));
     }
   }
 }
+
 void CCodec_ProgressiveDecoder::CFXCODEC_HorzTable::Calc(int dest_len,
                                                          int src_len,
                                                          FX_BOOL bInterpol) {
-  if (m_pWeightTables) {
-    FX_Free(m_pWeightTables);
-  }
   double scale = (double)dest_len / (double)src_len;
   m_ItemSize = sizeof(int) * 4;
   int size = dest_len * m_ItemSize + 4;
+  FX_Free(m_pWeightTables);
   m_pWeightTables = FX_Alloc(uint8_t, size);
   FXSYS_memset(m_pWeightTables, 0, size);
   if (scale > 1) {
     int pre_des_col = 0;
     for (int src_col = 0; src_col < src_len; src_col++) {
       double des_col_f = src_col * scale;
       int des_col = FXSYS_round((FX_FLOAT)des_col_f);
       PixelWeight* pWeight =
           (PixelWeight*)(m_pWeightTables + des_col * m_ItemSize);
       pWeight->m_SrcStart = pWeight->m_SrcEnd = src_col;
@@ skipping 30 matching lines @@
   for (int des_col = 0; des_col < dest_len; des_col++) {
     double src_col_f = des_col / scale;
     int src_col = FXSYS_round((FX_FLOAT)src_col_f);
     PixelWeight* pWeight =
         (PixelWeight*)(m_pWeightTables + des_col * m_ItemSize);
     pWeight->m_SrcStart = pWeight->m_SrcEnd = src_col;
     pWeight->m_Weights[0] = 65536;
     pWeight->m_Weights[1] = 0;
   }
 }
+
 void CCodec_ProgressiveDecoder::CFXCODEC_VertTable::Calc(int dest_len,
                                                          int src_len) {
-  if (m_pWeightTables) {
-    FX_Free(m_pWeightTables);
-  }
   double scale = (double)dest_len / (double)src_len;
   m_ItemSize = sizeof(int) * 4;
   int size = dest_len * m_ItemSize + 4;
+  FX_Free(m_pWeightTables);
   m_pWeightTables = FX_Alloc(uint8_t, size);
   FXSYS_memset(m_pWeightTables, 0, size);
-  if (scale > 1) {
-    double step = 0.0;
-    int src_row = 0;
-    while (step < (double)dest_len) {
-      int start_step = (int)step;
-      step = scale * (++src_row);
-      int end_step = (int)step;
-      if (end_step >= dest_len) {
-        end_step = dest_len;
-        for (int des_row = start_step; des_row < end_step; des_row++) {
-          PixelWeight* pWeight =
-              (PixelWeight*)(m_pWeightTables + des_row * m_ItemSize);
-          pWeight->m_SrcStart = start_step;
-          pWeight->m_SrcEnd = start_step;
-          pWeight->m_Weights[0] = 65536;
-          pWeight->m_Weights[1] = 0;
-        }
-        return;
-      }
-      int length = end_step - start_step;
-      {
-        PixelWeight* pWeight =
-            (PixelWeight*)(m_pWeightTables + start_step * m_ItemSize);
-        pWeight->m_SrcStart = start_step;
-        pWeight->m_SrcEnd = start_step;
-        pWeight->m_Weights[0] = 65536;
-        pWeight->m_Weights[1] = 0;
-      }
-      for (int des_row = start_step + 1; des_row < end_step; des_row++) {
-        PixelWeight* pWeight =
-            (PixelWeight*)(m_pWeightTables + des_row * m_ItemSize);
-        pWeight->m_SrcStart = start_step;
-        pWeight->m_SrcEnd = end_step;
-        pWeight->m_Weights[0] = FXSYS_round((FX_FLOAT)(end_step - des_row) /
-                                            (FX_FLOAT)length * 65536);
-        pWeight->m_Weights[1] = 65536 - pWeight->m_Weights[0];
-      }
-    }
-  } else {
+  if (scale <= 1) {
     for (int des_row = 0; des_row < dest_len; des_row++) {
       PixelWeight* pWeight =
           (PixelWeight*)(m_pWeightTables + des_row * m_ItemSize);
       pWeight->m_SrcStart = des_row;
       pWeight->m_SrcEnd = des_row;
       pWeight->m_Weights[0] = 65536;
       pWeight->m_Weights[1] = 0;
     }
+    return;
+  }
+
+  double step = 0.0;
+  int src_row = 0;
+  while (step < (double)dest_len) {
+    int start_step = (int)step;
+    step = scale * (++src_row);
+    int end_step = (int)step;
+    if (end_step >= dest_len) {
+      end_step = dest_len;
+      for (int des_row = start_step; des_row < end_step; des_row++) {
+        PixelWeight* pWeight =
+            (PixelWeight*)(m_pWeightTables + des_row * m_ItemSize);
+        pWeight->m_SrcStart = start_step;
+        pWeight->m_SrcEnd = start_step;
+        pWeight->m_Weights[0] = 65536;
+        pWeight->m_Weights[1] = 0;
+      }
+      return;
+    }
+    int length = end_step - start_step;
+    {
+      PixelWeight* pWeight =
+          (PixelWeight*)(m_pWeightTables + start_step * m_ItemSize);
+      pWeight->m_SrcStart = start_step;
+      pWeight->m_SrcEnd = start_step;
+      pWeight->m_Weights[0] = 65536;
+      pWeight->m_Weights[1] = 0;
+    }
+    for (int des_row = start_step + 1; des_row < end_step; des_row++) {
+      PixelWeight* pWeight =
+          (PixelWeight*)(m_pWeightTables + des_row * m_ItemSize);
+      pWeight->m_SrcStart = start_step;
+      pWeight->m_SrcEnd = end_step;
+      pWeight->m_Weights[0] = FXSYS_round((FX_FLOAT)(end_step - des_row) /
+                                          (FX_FLOAT)length * 65536);
+      pWeight->m_Weights[1] = 65536 - pWeight->m_Weights[0];
+    }
   }
 }
+
 CCodec_ProgressiveDecoder::CCodec_ProgressiveDecoder(
     CCodec_ModuleMgr* pCodecMgr) {
   m_pFile = nullptr;
   m_pJpegContext = nullptr;
   m_pPngContext = nullptr;
   m_pGifContext = nullptr;
   m_pBmpContext = nullptr;
   m_pTiffContext = nullptr;
   m_pCodecMgr = nullptr;
   m_pSrcBuf = nullptr;
   m_pDecodeBuf = nullptr;
   m_pDeviceBitmap = nullptr;
   m_pSrcPalette = nullptr;
   m_pCodecMgr = pCodecMgr;
   m_offSet = 0;
   m_SrcSize = 0;
   m_ScanlineSize = 0;
-  m_SrcWidth = m_SrcHeight = 0;
+  m_SrcWidth = 0;
+  m_SrcHeight = 0;
   m_SrcComponents = 0;
   m_SrcBPC = 0;
   m_SrcPassNumber = 0;
   m_clipBox = FX_RECT(0, 0, 0, 0);
   m_imagType = FXCODEC_IMAGE_UNKNOWN;
   m_status = FXCODEC_STATUS_DECODE_FINISH;
   m_TransMethod = -1;
   m_SrcRow = 0;
   m_SrcFormat = FXCodec_Invalid;
   m_bInterpol = TRUE;
   m_FrameNumber = 0;
   m_FrameCur = 0;
   m_SrcPaletteNumber = 0;
   m_GifPltNumber = 0;
   m_GifBgIndex = 0;
   m_pGifPalette = nullptr;
   m_GifTransIndex = -1;
   m_GifFrameRect = FX_RECT(0, 0, 0, 0);
   m_BmpIsTopBottom = FALSE;
 }
+
 CCodec_ProgressiveDecoder::~CCodec_ProgressiveDecoder() {
   m_pFile = nullptr;
-  if (m_pJpegContext) {
+  if (m_pJpegContext)
     m_pCodecMgr->GetJpegModule()->Finish(m_pJpegContext);
-  }
-  if (m_pPngContext) {
+  if (m_pPngContext)
     m_pCodecMgr->GetPngModule()->Finish(m_pPngContext);
-  }
-  if (m_pGifContext) {
+  if (m_pGifContext)
     m_pCodecMgr->GetGifModule()->Finish(m_pGifContext);
-  }
-  if (m_pBmpContext) {
+  if (m_pBmpContext)
     m_pCodecMgr->GetBmpModule()->Finish(m_pBmpContext);
-  }
-  if (m_pTiffContext) {
+  if (m_pTiffContext)
     m_pCodecMgr->GetTiffModule()->DestroyDecoder(m_pTiffContext);
-  }
   FX_Free(m_pSrcBuf);
   FX_Free(m_pDecodeBuf);
   FX_Free(m_pSrcPalette);
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::JpegReadMoreData(
     CCodec_JpegModule* pJpegModule,
     FXCODEC_STATUS& err_status) {
   uint32_t dwSize = (uint32_t)m_pFile->GetSize();
   if (dwSize <= m_offSet) {
     return FALSE;
   }
   dwSize = dwSize - m_offSet;
   uint32_t dwAvail = pJpegModule->GetAvailInput(m_pJpegContext, nullptr);
   if (dwAvail == m_SrcSize) {
@@ skipping 17 matching lines @@
     }
   }
   if (!m_pFile->ReadBlock(m_pSrcBuf + dwAvail, m_offSet, dwSize)) {
     err_status = FXCODEC_STATUS_ERR_READ;
     return FALSE;
   }
   m_offSet += dwSize;
   pJpegModule->Input(m_pJpegContext, m_pSrcBuf, dwSize + dwAvail);
   return TRUE;
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::PngReadHeaderFunc(void* pModule,
                                                      int width,
                                                      int height,
                                                      int bpc,
                                                      int pass,
                                                      int* color_type,
                                                      double* gamma) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   if (!pCodec->m_pDeviceBitmap) {
     pCodec->m_SrcWidth = width;
@@ skipping 28 matching lines @@
     case FXDIB_Argb:
       *color_type = 6;
       break;
     default:
       ASSERT(FALSE);
       return FALSE;
   }
   *gamma = FXCODEC_PNG_GAMMA;
   return TRUE;
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::PngAskScanlineBufFunc(void* pModule,
                                                          int line,
                                                          uint8_t*& src_buf) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   CFX_DIBitmap* pDIBitmap = pCodec->m_pDeviceBitmap;
   if (!pDIBitmap) {
     ASSERT(false);
     return FALSE;
   }
   if (line >= pCodec->m_clipBox.top && line < pCodec->m_clipBox.bottom) {
@@ skipping 54 matching lines @@
           *pDes++ = (uint8_t)((des_r) >> 16);
           *pDes = *p;
         } break;
         default:
           return FALSE;
       }
     }
   }
   return TRUE;
 }
+
 void CCodec_ProgressiveDecoder::PngOneOneMapResampleHorz(
     CFX_DIBitmap* pDeviceBitmap,
     int32_t des_line,
     uint8_t* src_scan,
     FXCodec_Format src_format) {
   uint8_t* des_scan = (uint8_t*)pDeviceBitmap->GetScanline(des_line);
   int32_t src_Bpp = (m_SrcFormat & 0xff) >> 3;
   int32_t des_Bpp = pDeviceBitmap->GetBPP() >> 3;
   int32_t src_left = m_clipBox.left;
   int32_t des_left = m_startX;
@@ skipping 51 matching lines @@
         *des_scan++ = (uint8_t)((des_b) >> 16);
         *des_scan++ = (uint8_t)((des_g) >> 16);
         *des_scan++ = (uint8_t)((des_r) >> 16);
         *des_scan++ = (uint8_t)((des_a) >> 16);
       } break;
       default:
         return;
     }
   }
 }
+
 void CCodec_ProgressiveDecoder::PngFillScanlineBufCompletedFunc(void* pModule,
                                                                 int pass,
                                                                 int line) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   CFX_DIBitmap* pDIBitmap = pCodec->m_pDeviceBitmap;
   ASSERT(pDIBitmap);
   int src_top = pCodec->m_clipBox.top;
   int src_bottom = pCodec->m_clipBox.bottom;
   int des_top = pCodec->m_startY;
   int src_hei = pCodec->m_clipBox.Height();
   int des_hei = pCodec->m_sizeY;
   if (line >= src_top && line < src_bottom) {
     double scale_y = (double)des_hei / (double)src_hei;
     int src_row = line - src_top;
     int des_row = (int)(src_row * scale_y) + des_top;
     if (des_row >= des_top + des_hei) {
       return;
     }
     pCodec->PngOneOneMapResampleHorz(pDIBitmap, des_row, pCodec->m_pDecodeBuf,
                                      pCodec->m_SrcFormat);
     if (pCodec->m_SrcPassNumber == 1 && scale_y > 1.0) {
       pCodec->ResampleVert(pDIBitmap, scale_y, des_row);
       return;
     }
     if (pass == 6 && scale_y > 1.0) {
       pCodec->ResampleVert(pDIBitmap, scale_y, des_row);
     }
   }
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::GifReadMoreData(CCodec_GifModule* pGifModule,
                                                    FXCODEC_STATUS& err_status) {
   uint32_t dwSize = (uint32_t)m_pFile->GetSize();
   if (dwSize <= m_offSet) {
     return FALSE;
   }
   dwSize = dwSize - m_offSet;
   uint32_t dwAvail = pGifModule->GetAvailInput(m_pGifContext, nullptr);
   if (dwAvail == m_SrcSize) {
     if (dwSize > FXCODEC_BLOCK_SIZE) {
@@ skipping 16 matching lines @@
     }
   }
   if (!m_pFile->ReadBlock(m_pSrcBuf + dwAvail, m_offSet, dwSize)) {
     err_status = FXCODEC_STATUS_ERR_READ;
     return FALSE;
   }
   m_offSet += dwSize;
   pGifModule->Input(m_pGifContext, m_pSrcBuf, dwSize + dwAvail);
   return TRUE;
 }
+
 void CCodec_ProgressiveDecoder::GifRecordCurrentPositionCallback(
     void* pModule,
     uint32_t& cur_pos) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   uint32_t remain_size =
       pCodec->m_pCodecMgr->GetGifModule()->GetAvailInput(pCodec->m_pGifContext);
   cur_pos = pCodec->m_offSet - remain_size;
 }
+
 uint8_t* CCodec_ProgressiveDecoder::GifAskLocalPaletteBufCallback(
     void* pModule,
     int32_t frame_num,
     int32_t pal_size) {
   return FX_Alloc(uint8_t, pal_size);
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::GifInputRecordPositionBufCallback(
     void* pModule,
     uint32_t rcd_pos,
     const FX_RECT& img_rc,
     int32_t pal_num,
     void* pal_ptr,
     int32_t delay_time,
     FX_BOOL user_input,
     int32_t trans_index,
     int32_t disposal_method,
@@ skipping 69 matching lines @@
         for (int col = 0; col < sizeX; col++) {
           FXARGB_SETDIB(pScanline, argb);
           pScanline += 4;
         }
         break;
       }
     }
   }
   return TRUE;
 }
+
 void CCodec_ProgressiveDecoder::GifReadScanlineCallback(void* pModule,
                                                         int32_t row_num,
                                                         uint8_t* row_buf) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   CFX_DIBitmap* pDIBitmap = pCodec->m_pDeviceBitmap;
   ASSERT(pDIBitmap);
   int32_t img_width = pCodec->m_GifFrameRect.Width();
   if (!pDIBitmap->HasAlpha()) {
     uint8_t* byte_ptr = row_buf;
     for (int i = 0; i < img_width; i++) {
@@ skipping 10 matching lines @@
   FXSYS_memset(pCodec->m_pDecodeBuf, pal_index, pCodec->m_SrcWidth);
   bool bLastPass = (row_num % 2) == 1;
   int32_t line = row_num + pCodec->m_GifFrameRect.top;
   int32_t left = pCodec->m_GifFrameRect.left;
   FXSYS_memcpy(pCodec->m_pDecodeBuf + left, row_buf, img_width);
   int src_top = pCodec->m_clipBox.top;
   int src_bottom = pCodec->m_clipBox.bottom;
   int des_top = pCodec->m_startY;
   int src_hei = pCodec->m_clipBox.Height();
   int des_hei = pCodec->m_sizeY;
-  if (line >= src_top && line < src_bottom) {
-    double scale_y = (double)des_hei / (double)src_hei;
-    int src_row = line - src_top;
-    int des_row = (int)(src_row * scale_y) + des_top;
-    if (des_row >= des_top + des_hei) {
-      return;
-    }
-    pCodec->ReSampleScanline(pDIBitmap, des_row, pCodec->m_pDecodeBuf,
-                             pCodec->m_SrcFormat);
-    if (scale_y > 1.0 &&
-        (!pCodec->m_bInterpol || pCodec->m_SrcPassNumber == 1)) {
-      pCodec->ResampleVert(pDIBitmap, scale_y, des_row);
-      return;
-    }
-    if (scale_y > 1.0) {
-      int des_bottom = des_top + pCodec->m_sizeY;
-      int des_Bpp = pDIBitmap->GetBPP() >> 3;
-      uint32_t des_ScanOffet = pCodec->m_startX * des_Bpp;
-      if (des_row + (int)scale_y >= des_bottom - 1) {
-        uint8_t* scan_src =
-            (uint8_t*)pDIBitmap->GetScanline(des_row) + des_ScanOffet;
-        int cur_row = des_row;
-        while (++cur_row < des_bottom) {
-          uint8_t* scan_des =
-              (uint8_t*)pDIBitmap->GetScanline(cur_row) + des_ScanOffet;
-          uint32_t size = pCodec->m_sizeX * des_Bpp;
-          FXSYS_memcpy(scan_des, scan_src, size);
-        }
-      }
-      if (bLastPass) {
-        pCodec->GifDoubleLineResampleVert(pDIBitmap, scale_y, des_row);
-      }
+  if (line < src_top || line >= src_bottom)
+    return;
+
+  double scale_y = (double)des_hei / (double)src_hei;
+  int src_row = line - src_top;
+  int des_row = (int)(src_row * scale_y) + des_top;
+  if (des_row >= des_top + des_hei)
+    return;
+
+  pCodec->ReSampleScanline(pDIBitmap, des_row, pCodec->m_pDecodeBuf,
+                           pCodec->m_SrcFormat);
+  if (scale_y > 1.0 && (!pCodec->m_bInterpol || pCodec->m_SrcPassNumber == 1)) {
+    pCodec->ResampleVert(pDIBitmap, scale_y, des_row);
+    return;
+  }
+  if (scale_y <= 1.0)
+    return;
+
+  int des_bottom = des_top + pCodec->m_sizeY;
+  int des_Bpp = pDIBitmap->GetBPP() >> 3;
+  uint32_t des_ScanOffet = pCodec->m_startX * des_Bpp;
+  if (des_row + (int)scale_y >= des_bottom - 1) {
+    uint8_t* scan_src =
+        (uint8_t*)pDIBitmap->GetScanline(des_row) + des_ScanOffet;
+    int cur_row = des_row;
+    while (++cur_row < des_bottom) {
+      uint8_t* scan_des =
+          (uint8_t*)pDIBitmap->GetScanline(cur_row) + des_ScanOffet;
+      uint32_t size = pCodec->m_sizeX * des_Bpp;
+      FXSYS_memcpy(scan_des, scan_src, size);
     }
   }
+  if (bLastPass)
+    pCodec->GifDoubleLineResampleVert(pDIBitmap, scale_y, des_row);
 }
+
 void CCodec_ProgressiveDecoder::GifDoubleLineResampleVert(
     CFX_DIBitmap* pDeviceBitmap,
     double scale_y,
     int des_row) {
   int des_Bpp = pDeviceBitmap->GetBPP() >> 3;
   uint32_t des_ScanOffet = m_startX * des_Bpp;
   int des_top = m_startY;
   int des_row_1 = des_row - int(2 * scale_y);
   if (des_row_1 < des_top) {
     des_row_1 = des_top;
@@ skipping 58 matching lines @@
           return;
       }
     }
   }
   int des_bottom = des_top + m_sizeY - 1;
   if (des_row + (int)(2 * scale_y) >= des_bottom &&
       des_row + (int)scale_y < des_bottom) {
     GifDoubleLineResampleVert(pDeviceBitmap, scale_y, des_row + (int)scale_y);
   }
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::BmpReadMoreData(CCodec_BmpModule* pBmpModule,
                                                    FXCODEC_STATUS& err_status) {
   uint32_t dwSize = (uint32_t)m_pFile->GetSize();
-  if (dwSize <= m_offSet) {
+  if (dwSize <= m_offSet)
     return FALSE;
-  }
+
   dwSize = dwSize - m_offSet;
   uint32_t dwAvail = pBmpModule->GetAvailInput(m_pBmpContext, nullptr);
   if (dwAvail == m_SrcSize) {
     if (dwSize > FXCODEC_BLOCK_SIZE) {
       dwSize = FXCODEC_BLOCK_SIZE;
     }
     m_SrcSize = (dwSize + dwAvail + FXCODEC_BLOCK_SIZE - 1) /
                 FXCODEC_BLOCK_SIZE * FXCODEC_BLOCK_SIZE;
     m_pSrcBuf = FX_Realloc(uint8_t, m_pSrcBuf, m_SrcSize);
     if (!m_pSrcBuf) {
@@ skipping 10 matching lines @@
     }
   }
   if (!m_pFile->ReadBlock(m_pSrcBuf + dwAvail, m_offSet, dwSize)) {
     err_status = FXCODEC_STATUS_ERR_READ;
     return FALSE;
   }
   m_offSet += dwSize;
   pBmpModule->Input(m_pBmpContext, m_pSrcBuf, dwSize + dwAvail);
   return TRUE;
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::BmpInputImagePositionBufCallback(
     void* pModule,
     uint32_t rcd_pos) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   pCodec->m_offSet = rcd_pos;
   FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR;
-  if (!pCodec->BmpReadMoreData(pCodec->m_pCodecMgr->GetBmpModule(),
-                               error_status)) {
-    return FALSE;
-  }
-  return TRUE;
+  return pCodec->BmpReadMoreData(pCodec->m_pCodecMgr->GetBmpModule(),
+                                 error_status);
 }
+
 void CCodec_ProgressiveDecoder::BmpReadScanlineCallback(void* pModule,
                                                         int32_t row_num,
                                                         uint8_t* row_buf) {
   CCodec_ProgressiveDecoder* pCodec = (CCodec_ProgressiveDecoder*)pModule;
   CFX_DIBitmap* pDIBitmap = pCodec->m_pDeviceBitmap;
   ASSERT(pDIBitmap);
   FXSYS_memcpy(pCodec->m_pDecodeBuf, row_buf, pCodec->m_ScanlineSize);
   int src_top = pCodec->m_clipBox.top;
   int src_bottom = pCodec->m_clipBox.bottom;
   int des_top = pCodec->m_startY;
   int src_hei = pCodec->m_clipBox.Height();
   int des_hei = pCodec->m_sizeY;
-  if (row_num >= src_top && row_num < src_bottom) {
-    double scale_y = (double)des_hei / (double)src_hei;
-    int src_row = row_num - src_top;
-    int des_row = (int)(src_row * scale_y) + des_top;
-    if (des_row >= des_top + des_hei) {
-      return;
-    }
-    pCodec->ReSampleScanline(pDIBitmap, des_row, pCodec->m_pDecodeBuf,
-                             pCodec->m_SrcFormat);
-    if (scale_y > 1.0) {
-      if (pCodec->m_BmpIsTopBottom || !pCodec->m_bInterpol) {
-        pCodec->ResampleVert(pDIBitmap, scale_y, des_row);
-        return;
-      } else {
-        pCodec->ResampleVertBT(pDIBitmap, scale_y, des_row);
-      }
-    }
+  if (row_num < src_top || row_num >= src_bottom)
+    return;
+
+  double scale_y = (double)des_hei / (double)src_hei;
+  int src_row = row_num - src_top;
+  int des_row = (int)(src_row * scale_y) + des_top;
+  if (des_row >= des_top + des_hei)
+    return;
+
+  pCodec->ReSampleScanline(pDIBitmap, des_row, pCodec->m_pDecodeBuf,
+                           pCodec->m_SrcFormat);
+  if (scale_y <= 1.0)
+    return;
+
+  if (pCodec->m_BmpIsTopBottom || !pCodec->m_bInterpol) {
+    pCodec->ResampleVert(pDIBitmap, scale_y, des_row);
+    return;
   }
+  pCodec->ResampleVertBT(pDIBitmap, scale_y, des_row);
 }
+
 void CCodec_ProgressiveDecoder::ResampleVertBT(CFX_DIBitmap* pDeviceBitmap,
                                                double scale_y,
                                                int des_row) {
   int des_Bpp = pDeviceBitmap->GetBPP() >> 3;
   uint32_t des_ScanOffet = m_startX * des_Bpp;
   int des_top = m_startY;
   int des_bottom = m_startY + m_sizeY;
   int des_row_1 = des_row + int(scale_y);
   if (des_row_1 >= des_bottom - 1) {
     uint8_t* scan_src =
@@ skipping 61 matching lines @@
           *scan_des++ = (uint8_t)((des_g) >> 16);
           *scan_des++ = (uint8_t)((des_r) >> 16);
           *scan_des++ = (uint8_t)((des_a) >> 16);
         } break;
         default:
           return;
       }
     }
   }
 }
+
 FX_BOOL CCodec_ProgressiveDecoder::DetectImageType(
     FXCODEC_IMAGE_TYPE imageType,
     CFX_DIBAttribute* pAttribute) {
   m_offSet = 0;
   uint32_t size = (uint32_t)m_pFile->GetSize();
   if (size > FXCODEC_BLOCK_SIZE) {
     size = FXCODEC_BLOCK_SIZE;
   }
   FX_Free(m_pSrcBuf);
   m_pSrcBuf = FX_Alloc(uint8_t, size);
@@ skipping 47 matching lines @@
           m_pSrcPalette = nullptr;
         }
         return TRUE;
       }
       if (m_pBmpContext) {
         pBmpModule->Finish(m_pBmpContext);
         m_pBmpContext = nullptr;
       }
       m_status = FXCODEC_STATUS_ERR_FORMAT;
       return FALSE;
-    } break;
+    }
     case FXCODEC_IMAGE_JPG: {
       CCodec_JpegModule* pJpegModule = m_pCodecMgr->GetJpegModule();
       if (!pJpegModule) {
         m_status = FXCODEC_STATUS_ERR_MEMORY;
         return FALSE;
       }
       m_pJpegContext = pJpegModule->Start();
       if (!m_pJpegContext) {
         m_status = FXCODEC_STATUS_ERR_MEMORY;
         return FALSE;
@@ skipping 22 matching lines @@
         m_SrcBPC = 8;
         m_clipBox = FX_RECT(0, 0, m_SrcWidth, m_SrcHeight);
         return TRUE;
       }
       if (m_pJpegContext) {
         pJpegModule->Finish(m_pJpegContext);
         m_pJpegContext = nullptr;
       }
       m_status = FXCODEC_STATUS_ERR_FORMAT;
       return FALSE;
-    } break;
+    }
     case FXCODEC_IMAGE_PNG: {
       CCodec_PngModule* pPngModule = m_pCodecMgr->GetPngModule();
       if (!pPngModule) {
         m_status = FXCODEC_STATUS_ERR_MEMORY;
         return FALSE;
       }
       pPngModule->ReadHeaderCallback =
           CCodec_ProgressiveDecoder::PngReadHeaderFunc;
       pPngModule->AskScanlineBufCallback =
           CCodec_ProgressiveDecoder::PngAskScanlineBufFunc;
@@ skipping 40 matching lines @@
       }
       ASSERT(!bResult);
       if (m_pPngContext) {
         pPngModule->Finish(m_pPngContext);
         m_pPngContext = nullptr;
       }
       if (m_SrcPassNumber == 0) {
         m_status = FXCODEC_STATUS_ERR_FORMAT;
         return FALSE;
       }
-    } break;
+    }

[Tom Sepez, 2016/06/09 17:53:16]

still need a break here, the return above is conditional, or a return true or
something?

[Lei Zhang, 2016/06/09 22:00:40]

Whoops.

     case FXCODEC_IMAGE_GIF: {
       CCodec_GifModule* pGifModule = m_pCodecMgr->GetGifModule();
       if (!pGifModule) {
         m_status = FXCODEC_STATUS_ERR_MEMORY;
         return FALSE;
       }
       pGifModule->RecordCurrentPositionCallback =
           CCodec_ProgressiveDecoder::GifRecordCurrentPositionCallback;
       pGifModule->AskLocalPaletteBufCallback =
           CCodec_ProgressiveDecoder::GifAskLocalPaletteBufCallback;
@@ skipping 31 matching lines @@
         m_SrcBPC = 8;
         m_clipBox = FX_RECT(0, 0, m_SrcWidth, m_SrcHeight);
         return TRUE;
       }
       if (m_pGifContext) {
         pGifModule->Finish(m_pGifContext);
         m_pGifContext = nullptr;
       }
       m_status = FXCODEC_STATUS_ERR_FORMAT;
       return FALSE;
-    } break;
+    }
     case FXCODEC_IMAGE_TIF: {
       CCodec_TiffModule* pTiffModule = m_pCodecMgr->GetTiffModule();
       if (!pTiffModule) {
         m_status = FXCODEC_STATUS_ERR_FORMAT;
         return FALSE;
       }
       m_pTiffContext = pTiffModule->CreateDecoder(m_pFile);
       if (!m_pTiffContext) {
         m_status = FXCODEC_STATUS_ERR_FORMAT;
         return FALSE;
       }
-      int32_t frames = 0;
-      pTiffModule->GetFrames(m_pTiffContext, frames);
-      uint32_t bpc;
-      FX_BOOL ret = pTiffModule->LoadFrameInfo(
-          m_pTiffContext, 0, (uint32_t&)m_SrcWidth, (uint32_t&)m_SrcHeight,
-          (uint32_t&)m_SrcComponents, bpc, pAttribute);
+      int32_t dummy_bpc;
+      FX_BOOL ret = pTiffModule->LoadFrameInfo(m_pTiffContext, 0, &m_SrcWidth,
+                                               &m_SrcHeight, &m_SrcComponents,
+                                               &dummy_bpc, pAttribute);
       m_SrcComponents = 4;
       m_clipBox = FX_RECT(0, 0, m_SrcWidth, m_SrcHeight);
       if (!ret) {
         pTiffModule->DestroyDecoder(m_pTiffContext);
-        (m_pTiffContext = nullptr);
-        (m_status = FXCODEC_STATUS_ERR_FORMAT);
+        m_pTiffContext = nullptr;
+        m_status = FXCODEC_STATUS_ERR_FORMAT;
         return FALSE;
       }
-    } break;
+      return TRUE;
+    }
     default:
       m_status = FXCODEC_STATUS_ERR_FORMAT;
       return FALSE;
   }
-  return TRUE;
 }
+
 FXCODEC_STATUS CCodec_ProgressiveDecoder::LoadImageInfo(
     IFX_FileRead* pFile,
     FXCODEC_IMAGE_TYPE imageType,
     CFX_DIBAttribute* pAttribute) {
   switch (m_status) {
     case FXCODEC_STATUS_FRAME_READY:
     case FXCODEC_STATUS_FRAME_TOBECONTINUE:
     case FXCODEC_STATUS_DECODE_READY:
     case FXCODEC_STATUS_DECODE_TOBECONTINUE:
       return FXCODEC_STATUS_ERROR;
@@ skipping 23 matching lines @@
     if (DetectImageType((FXCODEC_IMAGE_TYPE)type, pAttribute)) {
       m_imagType = (FXCODEC_IMAGE_TYPE)type;
       m_status = FXCODEC_STATUS_FRAME_READY;
       return m_status;
     }
   }
   m_status = FXCODEC_STATUS_ERR_FORMAT;
   m_pFile = nullptr;
   return m_status;
 }
+
 void CCodec_ProgressiveDecoder::SetClipBox(FX_RECT* clip) {
-  if (m_status != FXCODEC_STATUS_FRAME_READY) {
+  if (m_status != FXCODEC_STATUS_FRAME_READY)
     return;
-  }
+
   if (clip->IsEmpty()) {
     m_clipBox = FX_RECT(0, 0, 0, 0);
     return;
   }
-  if (clip->left < 0) {
-    clip->left = 0;
-  }
-  if (clip->right > m_SrcWidth) {
-    clip->right = m_SrcWidth;
-  }
-  if (clip->top < 0) {
-    clip->top = 0;
-  }
-  if (clip->bottom > m_SrcHeight) {
-    clip->bottom = m_SrcHeight;
-  }
+  clip->left = std::max(clip->left, 0);
+  clip->right = std::min(clip->right, m_SrcWidth);
+  clip->top = std::max(clip->top, 0);
+  clip->bottom = std::min(clip->bottom, m_SrcHeight);
   if (clip->IsEmpty()) {
     m_clipBox = FX_RECT(0, 0, 0, 0);
     return;
   }
   m_clipBox = *clip;
 }
+
 void CCodec_ProgressiveDecoder::GetDownScale(int& down_scale) {
   down_scale = 1;
   int ratio_w = m_clipBox.Width() / m_sizeX;
   int ratio_h = m_clipBox.Height() / m_sizeY;
   int ratio = (ratio_w > ratio_h) ? ratio_h : ratio_w;
   if (ratio >= 8) {
     down_scale = 8;
   } else if (ratio >= 4) {
     down_scale = 4;
   } else if (ratio >= 2) {
     down_scale = 2;
   }
   m_clipBox.left /= down_scale;
   m_clipBox.right /= down_scale;
   m_clipBox.top /= down_scale;
   m_clipBox.bottom /= down_scale;
   if (m_clipBox.right == m_clipBox.left) {
     m_clipBox.right = m_clipBox.left + 1;
   }
   if (m_clipBox.bottom == m_clipBox.top) {
     m_clipBox.bottom = m_clipBox.top + 1;
   }
 }
+
 void CCodec_ProgressiveDecoder::GetTransMethod(FXDIB_Format des_format,
                                                FXCodec_Format src_format) {
   switch (des_format) {
     case FXDIB_1bppMask:
     case FXDIB_1bppRgb: {
       switch (src_format) {
         case FXCodec_1bppGray:
           m_TransMethod = 0;
           break;
         default:
@@ skipping 77 matching lines @@
           m_TransMethod = 11;
           break;
         default:
           m_TransMethod = -1;
       }
     } break;
     default:
       m_TransMethod = -1;
   }
 }
-void _RGB2BGR(uint8_t* buffer, int width = 1) {
-  if (buffer && width > 0) {
-    uint8_t temp;
-    int i = 0;
-    int j = 0;
-    for (; i < width; i++, j += 3) {
-      temp = buffer[j];
-      buffer[j] = buffer[j + 2];
-      buffer[j + 2] = temp;
-    }
-  }
-}
+
 void CCodec_ProgressiveDecoder::ReSampleScanline(CFX_DIBitmap* pDeviceBitmap,
                                                  int des_line,
                                                  uint8_t* src_scan,
                                                  FXCodec_Format src_format) {
   int src_left = m_clipBox.left;
   int des_left = m_startX;
   uint8_t* des_scan =
       pDeviceBitmap->GetBuffer() + des_line * pDeviceBitmap->GetPitch();
   int src_bpp = src_format & 0xff;
   int des_bpp = pDeviceBitmap->GetBPP();
@@ skipping 181 matching lines @@
         *des_scan++ = (uint8_t)((des_b) >> 16);
         *des_scan++ = (uint8_t)((des_g) >> 16);
         *des_scan++ = (uint8_t)((des_r) >> 16);
         *des_scan++ = (uint8_t)((des_alpha * 255) >> 16);
       } break;
       default:
         return;
     }
   }
 }
+
 void CCodec_ProgressiveDecoder::ResampleVert(CFX_DIBitmap* pDeviceBitmap,
                                              double scale_y,
                                              int des_row) {
   int des_Bpp = pDeviceBitmap->GetBPP() >> 3;
   uint32_t des_ScanOffet = m_startX * des_Bpp;
   if (m_bInterpol) {
     int des_top = m_startY;
     int des_row_1 = des_row - int(scale_y);
     if (des_row_1 < des_top) {
       int des_bottom = des_top + m_sizeY;
@@ skipping 92 matching lines @@
       if (des_row + i >= m_startY + m_sizeY) {
         return;
       }
       uint8_t* scan_des =
           (uint8_t*)pDeviceBitmap->GetScanline(des_row + i) + des_ScanOffet;
       uint32_t size = m_sizeX * des_Bpp;
       FXSYS_memcpy(scan_des, scan_src, size);
     }
   }
 }
+
 void CCodec_ProgressiveDecoder::Resample(CFX_DIBitmap* pDeviceBitmap,
                                          int32_t src_line,
                                          uint8_t* src_scan,
                                          FXCodec_Format src_format) {
   int src_top = m_clipBox.top;
   int des_top = m_startY;
   int src_hei = m_clipBox.Height();
   int des_hei = m_sizeY;
   if (src_line >= src_top) {
     double scale_y = (double)des_hei / (double)src_hei;
     int src_row = src_line - src_top;
     int des_row = (int)(src_row * scale_y) + des_top;
     if (des_row >= des_top + des_hei) {
       return;
     }
     ReSampleScanline(pDeviceBitmap, des_row, m_pDecodeBuf, src_format);
     if (scale_y > 1.0) {
       ResampleVert(pDeviceBitmap, scale_y, des_row);
     }
   }
 }
+
 FXCODEC_STATUS CCodec_ProgressiveDecoder::GetFrames(int32_t& frames,
                                                     IFX_Pause* pPause) {
   if (!(m_status == FXCODEC_STATUS_FRAME_READY ||
         m_status == FXCODEC_STATUS_FRAME_TOBECONTINUE)) {
     return FXCODEC_STATUS_ERROR;
   }
   switch (m_imagType) {
     case FXCODEC_IMAGE_BMP:
     case FXCODEC_IMAGE_JPG:
     case FXCODEC_IMAGE_PNG:
     case FXCODEC_IMAGE_TIF:
       frames = m_FrameNumber = 1;
-      return m_status = FXCODEC_STATUS_DECODE_READY;
+      m_status = FXCODEC_STATUS_DECODE_READY;
+      return m_status;
     case FXCODEC_IMAGE_GIF: {
       CCodec_GifModule* pGifModule = m_pCodecMgr->GetGifModule();
-      while (TRUE) {
+      while (true) {
         int32_t readResult =
             pGifModule->LoadFrameInfo(m_pGifContext, &m_FrameNumber);
         while (readResult == 2) {
           FXCODEC_STATUS error_status = FXCODEC_STATUS_ERR_READ;
           if (!GifReadMoreData(pGifModule, error_status)) {
             return error_status;
           }
           if (pPause && pPause->NeedToPauseNow()) {
-            return m_status = FXCODEC_STATUS_FRAME_TOBECONTINUE;
+            m_status = FXCODEC_STATUS_FRAME_TOBECONTINUE;
+            return m_status;
           }
           readResult = pGifModule->LoadFrameInfo(m_pGifContext, &m_FrameNumber);
         }
         if (readResult == 1) {
           frames = m_FrameNumber;
-          return m_status = FXCODEC_STATUS_DECODE_READY;
+          m_status = FXCODEC_STATUS_DECODE_READY;
+          return m_status;
         }
         if (m_pGifContext) {
           pGifModule->Finish(m_pGifContext);
           m_pGifContext = nullptr;
         }
-        return m_status = FXCODEC_STATUS_ERROR;
+        m_status = FXCODEC_STATUS_ERROR;
+        return m_status;
       }
-    } break;
+    }
     default:
-      break;
+      return FXCODEC_STATUS_ERROR;
   }
-  return FXCODEC_STATUS_ERROR;
 }
+
 FXCODEC_STATUS CCodec_ProgressiveDecoder::StartDecode(CFX_DIBitmap* pDIBitmap,
                                                       int start_x,
                                                       int start_y,
                                                       int size_x,
                                                       int size_y,
                                                       int32_t frames,
                                                       FX_BOOL bInterpol) {
   if (m_status != FXCODEC_STATUS_DECODE_READY)
     return FXCODEC_STATUS_ERROR;
 
   if (!pDIBitmap || pDIBitmap->GetBPP() < 8 || frames < 0 ||
       frames >= m_FrameNumber) {
     return FXCODEC_STATUS_ERR_PARAMS;
   }
   m_pDeviceBitmap = pDIBitmap;
-  if (m_clipBox.IsEmpty()) {
+  if (m_clipBox.IsEmpty())
     return FXCODEC_STATUS_ERR_PARAMS;
-  }
-  if (size_x <= 0 || size_x > 65535 || size_y <= 0 || size_y > 65535) {
+  if (size_x <= 0 || size_x > 65535 || size_y <= 0 || size_y > 65535)
     return FXCODEC_STATUS_ERR_PARAMS;
-  }
+
   FX_RECT device_rc =
       FX_RECT(start_x, start_y, start_x + size_x, start_y + size_y);
   int32_t out_range_x = device_rc.right - pDIBitmap->GetWidth();
   int32_t out_range_y = device_rc.bottom - pDIBitmap->GetHeight();
   device_rc.Intersect(
       FX_RECT(0, 0, pDIBitmap->GetWidth(), pDIBitmap->GetHeight()));
-  if (device_rc.IsEmpty()) {
+  if (device_rc.IsEmpty())
     return FXCODEC_STATUS_ERR_PARAMS;
-  }
+
   m_startX = device_rc.left;
   m_startY = device_rc.top;
   m_sizeX = device_rc.Width();
   m_sizeY = device_rc.Height();
   m_bInterpol = bInterpol;
   m_FrameCur = 0;
   if (start_x < 0 || out_range_x > 0) {
     FX_FLOAT scaleX = (FX_FLOAT)m_clipBox.Width() / (FX_FLOAT)size_x;
     if (start_x < 0) {
       m_clipBox.left -= (int32_t)FXSYS_ceil((FX_FLOAT)start_x * scaleX);
@@ skipping 18 matching lines @@
     case FXCODEC_IMAGE_JPG: {
       CCodec_JpegModule* pJpegModule = m_pCodecMgr->GetJpegModule();
       int down_scale = 1;
       GetDownScale(down_scale);
       FX_BOOL bStart = pJpegModule->StartScanline(m_pJpegContext, down_scale);
       while (!bStart) {
         FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR;
         if (!JpegReadMoreData(pJpegModule, error_status)) {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = error_status;
+          m_status = error_status;
+          return m_status;
         }
         bStart = pJpegModule->StartScanline(m_pJpegContext, down_scale);
       }
       int scanline_size = (m_SrcWidth + down_scale - 1) / down_scale;
       scanline_size = (scanline_size * m_SrcComponents + 3) / 4 * 4;
       FX_Free(m_pDecodeBuf);
       m_pDecodeBuf = FX_Alloc(uint8_t, scanline_size);
       FXSYS_memset(m_pDecodeBuf, 0, scanline_size);
       m_WeightHorz.Calc(m_sizeX, 0, m_sizeX, m_clipBox.Width(), 0,
                         m_clipBox.Width(), m_bInterpol);
       m_WeightVert.Calc(m_sizeY, m_clipBox.Height());
       switch (m_SrcComponents) {
         case 1:
           m_SrcFormat = FXCodec_8bppGray;
           break;
         case 3:
           m_SrcFormat = FXCodec_Rgb;
           break;
         case 4:
           m_SrcFormat = FXCodec_Cmyk;
           break;
       }
       GetTransMethod(pDIBitmap->GetFormat(), m_SrcFormat);
-      return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
-    } break;
+      m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+      return m_status;
+    }
     case FXCODEC_IMAGE_PNG: {
       CCodec_PngModule* pPngModule = m_pCodecMgr->GetPngModule();
       if (!pPngModule) {
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_ERR_MEMORY;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
       }
       if (m_pPngContext) {
         pPngModule->Finish(m_pPngContext);
         m_pPngContext = nullptr;
       }
       m_pPngContext = pPngModule->Start((void*)this);
       if (!m_pPngContext) {
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_ERR_MEMORY;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
       }
       m_offSet = 0;
       switch (m_pDeviceBitmap->GetFormat()) {
         case FXDIB_8bppMask:
         case FXDIB_8bppRgb:
           m_SrcComponents = 1;
           m_SrcFormat = FXCodec_8bppGray;
           break;
         case FXDIB_Rgb:
           m_SrcComponents = 3;
           m_SrcFormat = FXCodec_Rgb;
           break;
         case FXDIB_Rgb32:
         case FXDIB_Argb:
           m_SrcComponents = 4;
           m_SrcFormat = FXCodec_Argb;
           break;
         default: {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERR_PARAMS;
+          m_status = FXCODEC_STATUS_ERR_PARAMS;
+          return m_status;
         }
       }
       GetTransMethod(m_pDeviceBitmap->GetFormat(), m_SrcFormat);
       int scanline_size = (m_SrcWidth * m_SrcComponents + 3) / 4 * 4;
       FX_Free(m_pDecodeBuf);
       m_pDecodeBuf = FX_Alloc(uint8_t, scanline_size);
       FXSYS_memset(m_pDecodeBuf, 0, scanline_size);
       m_WeightHorzOO.Calc(m_sizeX, m_clipBox.Width(), m_bInterpol);
       m_WeightVert.Calc(m_sizeY, m_clipBox.Height());
-      return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
-    } break;
+      m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+      return m_status;
+    }
     case FXCODEC_IMAGE_GIF: {
       CCodec_GifModule* pGifModule = m_pCodecMgr->GetGifModule();
       if (!pGifModule) {
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_ERR_MEMORY;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
       }
       m_SrcFormat = FXCodec_8bppRgb;
       GetTransMethod(m_pDeviceBitmap->GetFormat(), m_SrcFormat);
       int scanline_size = (m_SrcWidth + 3) / 4 * 4;
       FX_Free(m_pDecodeBuf);
       m_pDecodeBuf = FX_Alloc(uint8_t, scanline_size);
       FXSYS_memset(m_pDecodeBuf, 0, scanline_size);
       m_WeightHorz.Calc(m_sizeX, 0, m_sizeX, m_clipBox.Width(), 0,
                         m_clipBox.Width(), m_bInterpol);
       m_WeightVert.Calc(m_sizeY, m_clipBox.Height());
       m_FrameCur = frames;
-      return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
-    } break;
+      m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+      return m_status;
+    }
     case FXCODEC_IMAGE_BMP: {
       CCodec_BmpModule* pBmpModule = m_pCodecMgr->GetBmpModule();
       if (!pBmpModule) {
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_ERR_MEMORY;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
       }
       switch (m_SrcComponents) {
         case 1:
           m_SrcFormat = FXCodec_8bppRgb;
           break;
         case 3:
           m_SrcFormat = FXCodec_Rgb;
           break;
         case 4:
           m_SrcFormat = FXCodec_Rgb32;
           break;
       }
       GetTransMethod(m_pDeviceBitmap->GetFormat(), m_SrcFormat);
       m_ScanlineSize = (m_SrcWidth * m_SrcComponents + 3) / 4 * 4;
       FX_Free(m_pDecodeBuf);
       m_pDecodeBuf = FX_Alloc(uint8_t, m_ScanlineSize);
       FXSYS_memset(m_pDecodeBuf, 0, m_ScanlineSize);
       m_WeightHorz.Calc(m_sizeX, 0, m_sizeX, m_clipBox.Width(), 0,
                         m_clipBox.Width(), m_bInterpol);
       m_WeightVert.Calc(m_sizeY, m_clipBox.Height());
-      return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
-    } break;
+      m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+      return m_status;
+    }
     case FXCODEC_IMAGE_TIF:
-      return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+      m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+      return m_status;
     default:
-      break;
+      return FXCODEC_STATUS_ERROR;
   }
-  return FXCODEC_STATUS_ERROR;
 }
+
 FXCODEC_STATUS CCodec_ProgressiveDecoder::ContinueDecode(IFX_Pause* pPause) {
-  if (m_status != FXCODEC_STATUS_DECODE_TOBECONTINUE) {
+  if (m_status != FXCODEC_STATUS_DECODE_TOBECONTINUE)
     return FXCODEC_STATUS_ERROR;
-  }
+
   switch (m_imagType) {
     case FXCODEC_IMAGE_JPG: {
       CCodec_JpegModule* pJpegModule = m_pCodecMgr->GetJpegModule();
-      while (TRUE) {
+      while (true) {
         FX_BOOL readRes =
             pJpegModule->ReadScanline(m_pJpegContext, m_pDecodeBuf);
         while (!readRes) {
           FXCODEC_STATUS error_status = FXCODEC_STATUS_DECODE_FINISH;
           if (!JpegReadMoreData(pJpegModule, error_status)) {
             m_pDeviceBitmap = nullptr;
             m_pFile = nullptr;
-            return m_status = error_status;
+            m_status = error_status;
+            return m_status;
           }
           readRes = pJpegModule->ReadScanline(m_pJpegContext, m_pDecodeBuf);
         }
         if (m_SrcFormat == FXCodec_Rgb) {
           int src_Bpp = (m_SrcFormat & 0xff) >> 3;
-          _RGB2BGR(m_pDecodeBuf + m_clipBox.left * src_Bpp, m_clipBox.Width());
+          RGB2BGR(m_pDecodeBuf + m_clipBox.left * src_Bpp, m_clipBox.Width());
         }
         if (m_SrcRow >= m_clipBox.bottom) {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_DECODE_FINISH;
+          m_status = FXCODEC_STATUS_DECODE_FINISH;
+          return m_status;
         }
         Resample(m_pDeviceBitmap, m_SrcRow, m_pDecodeBuf, m_SrcFormat);
         m_SrcRow++;
         if (pPause && pPause->NeedToPauseNow()) {
-          return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+          m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+          return m_status;
         }
       }
-    } break;
+    }
     case FXCODEC_IMAGE_PNG: {
       CCodec_PngModule* pPngModule = m_pCodecMgr->GetPngModule();
-      while (TRUE) {
+      while (true) {
         uint32_t remain_size = (uint32_t)m_pFile->GetSize() - m_offSet;
         uint32_t input_size =
             remain_size > FXCODEC_BLOCK_SIZE ? FXCODEC_BLOCK_SIZE : remain_size;
         if (input_size == 0) {
           if (m_pPngContext) {
             pPngModule->Finish(m_pPngContext);
           }
           m_pPngContext = nullptr;
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_DECODE_FINISH;
+          m_status = FXCODEC_STATUS_DECODE_FINISH;
+          return m_status;
         }
         if (m_pSrcBuf && input_size > m_SrcSize) {
           FX_Free(m_pSrcBuf);
           m_pSrcBuf = FX_Alloc(uint8_t, input_size);
           FXSYS_memset(m_pSrcBuf, 0, input_size);
           m_SrcSize = input_size;
         }
         FX_BOOL bResult = m_pFile->ReadBlock(m_pSrcBuf, m_offSet, input_size);
         if (!bResult) {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERR_READ;
+          m_status = FXCODEC_STATUS_ERR_READ;
+          return m_status;
         }
         m_offSet += input_size;
         bResult =
             pPngModule->Input(m_pPngContext, m_pSrcBuf, input_size, nullptr);
         if (!bResult) {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERROR;
+          m_status = FXCODEC_STATUS_ERROR;
+          return m_status;
         }
         if (pPause && pPause->NeedToPauseNow()) {
-          return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+          m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+          return m_status;
         }
       }
-    } break;
+    }
     case FXCODEC_IMAGE_GIF: {
       CCodec_GifModule* pGifModule = m_pCodecMgr->GetGifModule();
-      while (TRUE) {
+      while (true) {
         int32_t readRes =
             pGifModule->LoadFrame(m_pGifContext, m_FrameCur, nullptr);
         while (readRes == 2) {
           FXCODEC_STATUS error_status = FXCODEC_STATUS_DECODE_FINISH;
           if (!GifReadMoreData(pGifModule, error_status)) {
             m_pDeviceBitmap = nullptr;
             m_pFile = nullptr;
-            return m_status = error_status;
+            m_status = error_status;
+            return m_status;
           }
           if (pPause && pPause->NeedToPauseNow()) {
-            return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+            m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+            return m_status;
           }
           readRes = pGifModule->LoadFrame(m_pGifContext, m_FrameCur, nullptr);
         }
         if (readRes == 1) {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_DECODE_FINISH;
+          m_status = FXCODEC_STATUS_DECODE_FINISH;
+          return m_status;
         }
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_ERROR;
+        m_status = FXCODEC_STATUS_ERROR;
+        return m_status;
       }
-    } break;
+    }
     case FXCODEC_IMAGE_BMP: {
       CCodec_BmpModule* pBmpModule = m_pCodecMgr->GetBmpModule();
-      while (TRUE) {
+      while (true) {
         int32_t readRes = pBmpModule->LoadImage(m_pBmpContext);
         while (readRes == 2) {
           FXCODEC_STATUS error_status = FXCODEC_STATUS_DECODE_FINISH;
           if (!BmpReadMoreData(pBmpModule, error_status)) {
             m_pDeviceBitmap = nullptr;
             m_pFile = nullptr;
-            return m_status = error_status;
+            m_status = error_status;
+            return m_status;
           }
           if (pPause && pPause->NeedToPauseNow()) {
-            return m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+            m_status = FXCODEC_STATUS_DECODE_TOBECONTINUE;
+            return m_status;
           }
           readRes = pBmpModule->LoadImage(m_pBmpContext);
         }
         if (readRes == 1) {
           m_pDeviceBitmap = nullptr;
           m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_DECODE_FINISH;
+          m_status = FXCODEC_STATUS_DECODE_FINISH;
+          return m_status;
         }
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_ERROR;
+        m_status = FXCODEC_STATUS_ERROR;
+        return m_status;
       }
-    } break;
+    };
     case FXCODEC_IMAGE_TIF: {
       CCodec_TiffModule* pTiffModule = m_pCodecMgr->GetTiffModule();
       FX_BOOL ret = FALSE;
       if (m_pDeviceBitmap->GetBPP() == 32 &&
           m_pDeviceBitmap->GetWidth() == m_SrcWidth && m_SrcWidth == m_sizeX &&
           m_pDeviceBitmap->GetHeight() == m_SrcHeight &&
           m_SrcHeight == m_sizeY && m_startX == 0 && m_startY == 0 &&
           m_clipBox.left == 0 && m_clipBox.top == 0 &&
           m_clipBox.right == m_SrcWidth && m_clipBox.bottom == m_SrcHeight) {
         ret = pTiffModule->Decode(m_pTiffContext, m_pDeviceBitmap);
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
         if (!ret) {
-          return m_status = FXCODEC_STATUS_ERROR;
+          m_status = FXCODEC_STATUS_ERROR;
+          return m_status;
         }
-        return m_status = FXCODEC_STATUS_DECODE_FINISH;
-      } else {
-        CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap;
-        pDIBitmap->Create(m_SrcWidth, m_SrcHeight, FXDIB_Argb);
-        if (!pDIBitmap->GetBuffer()) {
-          delete pDIBitmap;
-          m_pDeviceBitmap = nullptr;
-          m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERR_MEMORY;
-        }
-        ret = pTiffModule->Decode(m_pTiffContext, pDIBitmap);
-        if (!ret) {
-          delete pDIBitmap;
-          m_pDeviceBitmap = nullptr;
-          m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERROR;
-        }
-        CFX_DIBitmap* pClipBitmap =
-            (m_clipBox.left == 0 && m_clipBox.top == 0 &&
-             m_clipBox.right == m_SrcWidth && m_clipBox.bottom == m_SrcHeight)
-                ? pDIBitmap
-                : pDIBitmap->Clone(&m_clipBox);
-        if (pDIBitmap != pClipBitmap) {
-          delete pDIBitmap;
-        }
-        if (!pClipBitmap) {
-          m_pDeviceBitmap = nullptr;
-          m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERR_MEMORY;
-        }
-        CFX_DIBitmap* pFormatBitmap = nullptr;
-        switch (m_pDeviceBitmap->GetFormat()) {
-          case FXDIB_8bppRgb:
-            pFormatBitmap = new CFX_DIBitmap;
-            pFormatBitmap->Create(pClipBitmap->GetWidth(),
-                                  pClipBitmap->GetHeight(), FXDIB_8bppRgb);
-            break;
-          case FXDIB_8bppMask:
-            pFormatBitmap = new CFX_DIBitmap;
-            pFormatBitmap->Create(pClipBitmap->GetWidth(),
-                                  pClipBitmap->GetHeight(), FXDIB_8bppMask);
-            break;
-          case FXDIB_Rgb:
-            pFormatBitmap = new CFX_DIBitmap;
-            pFormatBitmap->Create(pClipBitmap->GetWidth(),
-                                  pClipBitmap->GetHeight(), FXDIB_Rgb);
-            break;
-          case FXDIB_Rgb32:
-            pFormatBitmap = new CFX_DIBitmap;
-            pFormatBitmap->Create(pClipBitmap->GetWidth(),
-                                  pClipBitmap->GetHeight(), FXDIB_Rgb32);
-            break;
-          case FXDIB_Argb:
-            pFormatBitmap = pClipBitmap;
-            break;
-          default:
-            break;
-        }
-        switch (m_pDeviceBitmap->GetFormat()) {
-          case FXDIB_8bppRgb:
-          case FXDIB_8bppMask: {
-            for (int32_t row = 0; row < pClipBitmap->GetHeight(); row++) {
-              uint8_t* src_line = (uint8_t*)pClipBitmap->GetScanline(row);
-              uint8_t* des_line = (uint8_t*)pFormatBitmap->GetScanline(row);
-              for (int32_t col = 0; col < pClipBitmap->GetWidth(); col++) {
-                uint8_t _a = 255 - src_line[3];
-                uint8_t b = (src_line[0] * src_line[3] + 0xFF * _a) / 255;
-                uint8_t g = (src_line[1] * src_line[3] + 0xFF * _a) / 255;
-                uint8_t r = (src_line[2] * src_line[3] + 0xFF * _a) / 255;
-                *des_line++ = FXRGB2GRAY(r, g, b);
-                src_line += 4;
-              }
-            }
-          } break;
-          case FXDIB_Rgb:
-          case FXDIB_Rgb32: {
-            int32_t desBpp =
-                (m_pDeviceBitmap->GetFormat() == FXDIB_Rgb) ? 3 : 4;
-            for (int32_t row = 0; row < pClipBitmap->GetHeight(); row++) {
-              uint8_t* src_line = (uint8_t*)pClipBitmap->GetScanline(row);
-              uint8_t* des_line = (uint8_t*)pFormatBitmap->GetScanline(row);
-              for (int32_t col = 0; col < pClipBitmap->GetWidth(); col++) {
-                uint8_t _a = 255 - src_line[3];
-                uint8_t b = (src_line[0] * src_line[3] + 0xFF * _a) / 255;
-                uint8_t g = (src_line[1] * src_line[3] + 0xFF * _a) / 255;
-                uint8_t r = (src_line[2] * src_line[3] + 0xFF * _a) / 255;
-                *des_line++ = b;
-                *des_line++ = g;
-                *des_line++ = r;
-                des_line += desBpp - 3;
-                src_line += 4;
-              }
-            }
-          } break;
-          default:
-            break;
-        }
-        if (pClipBitmap != pFormatBitmap) {
-          delete pClipBitmap;
-        }
-        if (!pFormatBitmap) {
-          m_pDeviceBitmap = nullptr;
-          m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERR_MEMORY;
-        }
-        CFX_DIBitmap* pStrechBitmap = pFormatBitmap->StretchTo(
-            m_sizeX, m_sizeY, m_bInterpol ? FXDIB_INTERPOL : FXDIB_DOWNSAMPLE);
-        delete pFormatBitmap;
-        pFormatBitmap = nullptr;
-        if (!pStrechBitmap) {
-          m_pDeviceBitmap = nullptr;
-          m_pFile = nullptr;
-          return m_status = FXCODEC_STATUS_ERR_MEMORY;
-        }
-        m_pDeviceBitmap->TransferBitmap(m_startX, m_startY, m_sizeX, m_sizeY,
-                                        pStrechBitmap, 0, 0);
-        delete pStrechBitmap;
-        pStrechBitmap = nullptr;
+        m_status = FXCODEC_STATUS_DECODE_FINISH;
+        return m_status;
+      }
+
+      CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap;
+      pDIBitmap->Create(m_SrcWidth, m_SrcHeight, FXDIB_Argb);
+      if (!pDIBitmap->GetBuffer()) {
+        delete pDIBitmap;
         m_pDeviceBitmap = nullptr;
         m_pFile = nullptr;
-        return m_status = FXCODEC_STATUS_DECODE_FINISH;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
       }
-    } break;
+      ret = pTiffModule->Decode(m_pTiffContext, pDIBitmap);
+      if (!ret) {
+        delete pDIBitmap;
+        m_pDeviceBitmap = nullptr;
+        m_pFile = nullptr;
+        m_status = FXCODEC_STATUS_ERROR;
+        return m_status;
+      }
+      CFX_DIBitmap* pClipBitmap =
+          (m_clipBox.left == 0 && m_clipBox.top == 0 &&
+           m_clipBox.right == m_SrcWidth && m_clipBox.bottom == m_SrcHeight)
+              ? pDIBitmap
+              : pDIBitmap->Clone(&m_clipBox);
+      if (pDIBitmap != pClipBitmap) {
+        delete pDIBitmap;
+      }
+      if (!pClipBitmap) {
+        m_pDeviceBitmap = nullptr;
+        m_pFile = nullptr;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
+      }
+      CFX_DIBitmap* pFormatBitmap = nullptr;
+      switch (m_pDeviceBitmap->GetFormat()) {
+        case FXDIB_8bppRgb:
+          pFormatBitmap = new CFX_DIBitmap;
+          pFormatBitmap->Create(pClipBitmap->GetWidth(),
+                                pClipBitmap->GetHeight(), FXDIB_8bppRgb);
+          break;
+        case FXDIB_8bppMask:
+          pFormatBitmap = new CFX_DIBitmap;
+          pFormatBitmap->Create(pClipBitmap->GetWidth(),
+                                pClipBitmap->GetHeight(), FXDIB_8bppMask);
+          break;
+        case FXDIB_Rgb:
+          pFormatBitmap = new CFX_DIBitmap;
+          pFormatBitmap->Create(pClipBitmap->GetWidth(),
+                                pClipBitmap->GetHeight(), FXDIB_Rgb);
+          break;
+        case FXDIB_Rgb32:
+          pFormatBitmap = new CFX_DIBitmap;
+          pFormatBitmap->Create(pClipBitmap->GetWidth(),
+                                pClipBitmap->GetHeight(), FXDIB_Rgb32);
+          break;
+        case FXDIB_Argb:
+          pFormatBitmap = pClipBitmap;
+          break;
+        default:
+          break;
+      }
+      switch (m_pDeviceBitmap->GetFormat()) {
+        case FXDIB_8bppRgb:
+        case FXDIB_8bppMask: {
+          for (int32_t row = 0; row < pClipBitmap->GetHeight(); row++) {
+            uint8_t* src_line = (uint8_t*)pClipBitmap->GetScanline(row);
+            uint8_t* des_line = (uint8_t*)pFormatBitmap->GetScanline(row);
+            for (int32_t col = 0; col < pClipBitmap->GetWidth(); col++) {
+              uint8_t _a = 255 - src_line[3];
+              uint8_t b = (src_line[0] * src_line[3] + 0xFF * _a) / 255;
+              uint8_t g = (src_line[1] * src_line[3] + 0xFF * _a) / 255;
+              uint8_t r = (src_line[2] * src_line[3] + 0xFF * _a) / 255;
+              *des_line++ = FXRGB2GRAY(r, g, b);
+              src_line += 4;
+            }
+          }
+        } break;
+        case FXDIB_Rgb:
+        case FXDIB_Rgb32: {
+          int32_t desBpp = (m_pDeviceBitmap->GetFormat() == FXDIB_Rgb) ? 3 : 4;
+          for (int32_t row = 0; row < pClipBitmap->GetHeight(); row++) {
+            uint8_t* src_line = (uint8_t*)pClipBitmap->GetScanline(row);
+            uint8_t* des_line = (uint8_t*)pFormatBitmap->GetScanline(row);
+            for (int32_t col = 0; col < pClipBitmap->GetWidth(); col++) {
+              uint8_t _a = 255 - src_line[3];
+              uint8_t b = (src_line[0] * src_line[3] + 0xFF * _a) / 255;
+              uint8_t g = (src_line[1] * src_line[3] + 0xFF * _a) / 255;
+              uint8_t r = (src_line[2] * src_line[3] + 0xFF * _a) / 255;
+              *des_line++ = b;
+              *des_line++ = g;
+              *des_line++ = r;
+              des_line += desBpp - 3;
+              src_line += 4;
+            }
+          }
+        } break;
+        default:
+          break;
+      }
+      if (pClipBitmap != pFormatBitmap) {
+        delete pClipBitmap;
+      }
+      if (!pFormatBitmap) {
+        m_pDeviceBitmap = nullptr;
+        m_pFile = nullptr;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
+      }
+      CFX_DIBitmap* pStrechBitmap = pFormatBitmap->StretchTo(
+          m_sizeX, m_sizeY, m_bInterpol ? FXDIB_INTERPOL : FXDIB_DOWNSAMPLE);
+      delete pFormatBitmap;
+      pFormatBitmap = nullptr;
+      if (!pStrechBitmap) {
+        m_pDeviceBitmap = nullptr;
+        m_pFile = nullptr;
+        m_status = FXCODEC_STATUS_ERR_MEMORY;
+        return m_status;
+      }
+      m_pDeviceBitmap->TransferBitmap(m_startX, m_startY, m_sizeX, m_sizeY,
+                                      pStrechBitmap, 0, 0);
+      delete pStrechBitmap;
+      pStrechBitmap = nullptr;
+      m_pDeviceBitmap = nullptr;
+      m_pFile = nullptr;
+      m_status = FXCODEC_STATUS_DECODE_FINISH;
+      return m_status;
+    }
     default:
-      break;
+      return FXCODEC_STATUS_ERROR;
   }
-  return FXCODEC_STATUS_ERROR;
 }
+
 CCodec_ProgressiveDecoder* CCodec_ModuleMgr::CreateProgressiveDecoder() {
   return new CCodec_ProgressiveDecoder(this);
 }