| Index: core/fxcodec/codec/fx_codec_progress.cpp
|
| diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
|
| index ec3347cdaac544c1a3904d1d947e82eb7bf335c2..cb6c185be3c347506b845d57b0b25c283407dccc 100644
|
| --- a/core/fxcodec/codec/fx_codec_progress.cpp
|
| +++ b/core/fxcodec/codec/fx_codec_progress.cpp
|
| @@ -253,7 +253,8 @@ CCodec_ProgressiveDecoder::CCodec_ProgressiveDecoder(
|
| 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;
|
| @@ -1231,12 +1232,10 @@ FX_BOOL CCodec_ProgressiveDecoder::DetectImageType(
|
| 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) {
|
|
|