Simplify FXCODEC_STATUS error codes.
We never do anything differently based upon the specific XFA-only
extensions to FXCODEC_STATUS, so fold these cases into the
FXCODEC_STATUS_ERROR catch-all.
Change-Id: I8dc474ee2b7b15ac3d1edaf54c55c336fece6e79
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84210
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxcodec/fx_codec_def.h b/core/fxcodec/fx_codec_def.h
index c76f5bb..24d21d5 100644
--- a/core/fxcodec/fx_codec_def.h
+++ b/core/fxcodec/fx_codec_def.h
@@ -14,13 +14,6 @@
FXCODEC_STATUS_DECODE_READY,
FXCODEC_STATUS_DECODE_TOBECONTINUE,
FXCODEC_STATUS_DECODE_FINISH,
-#ifdef PDF_ENABLE_XFA
- FXCODEC_STATUS_ERR_MEMORY,
- FXCODEC_STATUS_ERR_READ,
- FXCODEC_STATUS_ERR_FLUSH,
- FXCODEC_STATUS_ERR_FORMAT,
- FXCODEC_STATUS_ERR_PARAMS
-#endif // PDF_ENABLE_XFA
};
#ifdef PDF_ENABLE_XFA
diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index dc95c53..bde72ba 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -640,7 +640,7 @@
pBmpContext.get(), &m_SrcWidth, &m_SrcHeight, &m_BmpIsTopBottom,
&m_SrcComponents, &m_SrcPaletteNumber, &palette, pAttribute);
while (read_result == BmpDecoder::Status::kContinue) {
- FXCODEC_STATUS error_status = FXCODEC_STATUS_ERR_FORMAT;
+ FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR;
if (!BmpReadMoreData(pBmpContext.get(), &error_status)) {
m_status = error_status;
return false;
@@ -651,7 +651,7 @@
}
if (read_result != BmpDecoder::Status::kSuccess) {
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -670,7 +670,7 @@
format = FXDIB_Format::kRgb32;
break;
default:
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -680,14 +680,14 @@
CFX_DIBitmap::CalculatePitchAndSize(m_SrcWidth, m_SrcHeight, format,
kNoPitch);
if (!needed_data.has_value()) {
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
uint32_t available_data = m_pFile->GetSize() - m_offSet +
BmpDecoder::GetAvailInput(pBmpContext.get());
if (needed_data.value().size > available_data) {
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -765,7 +765,7 @@
GifDecoder::ReadHeader(m_pGifContext.get(), &m_SrcWidth, &m_SrcHeight,
&m_GifPltNumber, &m_pGifPalette, &m_GifBgIndex);
while (readResult == GifDecoder::Status::kUnfinished) {
- FXCODEC_STATUS error_status = FXCODEC_STATUS_ERR_FORMAT;
+ FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR;
if (!GifReadMoreData(&error_status)) {
m_pGifContext = nullptr;
m_status = error_status;
@@ -781,7 +781,7 @@
return true;
}
m_pGifContext = nullptr;
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -921,7 +921,7 @@
CFX_DIBAttribute* pAttribute) {
m_pJpegContext = JpegProgressiveDecoder::Start();
if (!m_pJpegContext) {
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
JpegProgressiveDecoder::GetInstance()->Input(m_pJpegContext.get(),
@@ -931,7 +931,7 @@
// the marker indicates a fatal error.
if (setjmp(JpegProgressiveDecoder::GetJumpMark(m_pJpegContext.get())) == -1) {
m_pJpegContext.reset();
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -939,7 +939,7 @@
m_pJpegContext.get(), &m_SrcWidth, &m_SrcHeight, &m_SrcComponents,
pAttribute);
while (readResult == 2) {
- FXCODEC_STATUS error_status = FXCODEC_STATUS_ERR_FORMAT;
+ FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR;
if (!JpegReadMoreData(&error_status)) {
m_status = error_status;
return false;
@@ -954,7 +954,7 @@
return true;
}
m_pJpegContext.reset();
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -1123,7 +1123,7 @@
CFX_DIBAttribute* pAttribute) {
m_pPngContext = PngDecoder::StartDecode(this);
if (!m_pPngContext) {
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
while (PngDecoder::ContinueDecode(m_pPngContext.get(), m_pCodecMemory,
@@ -1132,7 +1132,7 @@
uint32_t input_size = std::min<uint32_t>(remain_size, kBlockSize);
if (input_size == 0) {
m_pPngContext.reset();
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
if (m_pCodecMemory && input_size > m_pCodecMemory->GetSize())
@@ -1140,14 +1140,14 @@
if (!m_pFile->ReadBlockAtOffset(m_pCodecMemory->GetBuffer(), m_offSet,
input_size)) {
- m_status = FXCODEC_STATUS_ERR_READ;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
m_offSet += input_size;
}
m_pPngContext.reset();
if (m_SrcPassNumber == 0) {
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
return true;
@@ -1159,7 +1159,7 @@
if (!m_pPngContext) {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
m_offSet = 0;
@@ -1181,7 +1181,7 @@
default: {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_PARAMS;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
}
@@ -1213,7 +1213,7 @@
if (!bResult) {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_READ;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
m_offSet += input_size;
@@ -1234,7 +1234,7 @@
CFX_DIBAttribute* pAttribute) {
m_pTiffContext = TiffDecoder::CreateDecoder(m_pFile);
if (!m_pTiffContext) {
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
int32_t dummy_bpc;
@@ -1245,7 +1245,7 @@
m_clipBox = FX_RECT(0, 0, m_SrcWidth, m_SrcHeight);
if (!ret) {
m_pTiffContext.reset();
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
return true;
@@ -1275,7 +1275,7 @@
if (!pDIBitmap->GetBuffer()) {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
ret = TiffDecoder::Decode(m_pTiffContext.get(), pDIBitmap);
@@ -1293,7 +1293,7 @@
if (!pClipBitmap) {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
RetainPtr<CFX_DIBitmap> pFormatBitmap;
@@ -1366,7 +1366,7 @@
if (!pFormatBitmap) {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
@@ -1378,7 +1378,7 @@
if (!pStrechBitmap) {
m_pDeviceBitmap = nullptr;
m_pFile = nullptr;
- m_status = FXCODEC_STATUS_ERR_MEMORY;
+ m_status = FXCODEC_STATUS_ERROR;
return m_status;
}
m_pDeviceBitmap->TransferBitmap(m_startX, m_startY, m_sizeX, m_sizeY,
@@ -1402,7 +1402,7 @@
m_offSet = 0;
if (!m_pFile->ReadBlockAtOffset(m_pCodecMemory->GetBuffer(), m_offSet,
size)) {
- m_status = FXCODEC_STATUS_ERR_READ;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
m_offSet += size;
@@ -1425,7 +1425,7 @@
return PngDetectImageTypeInBuffer(pAttribute);
#endif // PDF_ENABLE_XFA_PNG
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
return false;
}
@@ -1458,7 +1458,7 @@
std::min<uint32_t>(dwBytesToFetchFromFile, kBlockSize);
size_t dwNewSize = m_pCodecMemory->GetSize() + dwBytesToFetchFromFile;
if (!m_pCodecMemory->TryResize(dwNewSize)) {
- *err_status = FXCODEC_STATUS_ERR_MEMORY;
+ *err_status = FXCODEC_STATUS_ERROR;
return false;
}
} else {
@@ -1471,7 +1471,7 @@
// Append new data past the bytes not yet processed by the codec.
if (!m_pFile->ReadBlockAtOffset(m_pCodecMemory->GetBuffer() + dwUnconsumed,
m_offSet, dwBytesToFetchFromFile)) {
- *err_status = FXCODEC_STATUS_ERR_READ;
+ *err_status = FXCODEC_STATUS_ERROR;
return false;
}
m_offSet += dwBytesToFetchFromFile;
@@ -1495,7 +1495,7 @@
break;
}
if (!pFile) {
- m_status = FXCODEC_STATUS_ERR_PARAMS;
+ m_status = FXCODEC_STATUS_ERROR;
m_pFile = nullptr;
return m_status;
}
@@ -1526,7 +1526,7 @@
return m_status;
}
}
- m_status = FXCODEC_STATUS_ERR_FORMAT;
+ m_status = FXCODEC_STATUS_ERROR;
m_pFile = nullptr;
return m_status;
}
@@ -2052,7 +2052,7 @@
std::tie(readResult, m_FrameNumber) =
GifDecoder::LoadFrameInfo(m_pGifContext.get());
while (readResult == GifDecoder::Status::kUnfinished) {
- FXCODEC_STATUS error_status = FXCODEC_STATUS_ERR_READ;
+ FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR;
if (!GifReadMoreData(&error_status))
return {error_status, 0};
@@ -2084,13 +2084,13 @@
return FXCODEC_STATUS_ERROR;
if (!pDIBitmap || pDIBitmap->GetBPP() < 8 || m_FrameNumber == 0)
- return FXCODEC_STATUS_ERR_PARAMS;
+ return FXCODEC_STATUS_ERROR;
m_pDeviceBitmap = pDIBitmap;
if (m_clipBox.IsEmpty())
- return FXCODEC_STATUS_ERR_PARAMS;
+ return FXCODEC_STATUS_ERROR;
if (size_x <= 0 || size_x > 65535 || size_y <= 0 || size_y > 65535)
- return FXCODEC_STATUS_ERR_PARAMS;
+ return FXCODEC_STATUS_ERROR;
FX_RECT device_rc =
FX_RECT(start_x, start_y, start_x + size_x, start_y + size_y);
@@ -2099,7 +2099,7 @@
device_rc.Intersect(
FX_RECT(0, 0, pDIBitmap->GetWidth(), pDIBitmap->GetHeight()));
if (device_rc.IsEmpty())
- return FXCODEC_STATUS_ERR_PARAMS;
+ return FXCODEC_STATUS_ERROR;
m_startX = device_rc.left;
m_startY = device_rc.top;
@@ -2127,7 +2127,7 @@
}
}
if (m_clipBox.IsEmpty()) {
- return FXCODEC_STATUS_ERR_PARAMS;
+ return FXCODEC_STATUS_ERROR;
}
switch (m_imageType) {
#ifdef PDF_ENABLE_XFA_BMP
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 6cb200b..60af2bb 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -65,15 +65,6 @@
return dibFormat;
}
-bool IsFXCodecErrorStatus(FXCODEC_STATUS status) {
- return (status == FXCODEC_STATUS_ERROR ||
- status == FXCODEC_STATUS_ERR_MEMORY ||
- status == FXCODEC_STATUS_ERR_READ ||
- status == FXCODEC_STATUS_ERR_FLUSH ||
- status == FXCODEC_STATUS_ERR_FORMAT ||
- status == FXCODEC_STATUS_ERR_PARAMS);
-}
-
} // namespace
void XFA_DrawImage(CFGAS_GEGraphics* pGS,
@@ -199,12 +190,12 @@
status = pProgressiveDecoder->StartDecode(pBitmap, 0, 0, pBitmap->GetWidth(),
pBitmap->GetHeight());
- if (IsFXCodecErrorStatus(status))
+ if (status == FXCODEC_STATUS_ERROR)
return nullptr;
while (status == FXCODEC_STATUS_DECODE_TOBECONTINUE) {
status = pProgressiveDecoder->ContinueDecode();
- if (IsFXCodecErrorStatus(status))
+ if (status == FXCODEC_STATUS_ERROR)
return nullptr;
}
