Remove effectively unused CFX_DIBAttribute members.
They are written to, but never read by non-test code. Simplify modified
code and remove unneeded bits.
Change-Id: Ia92ffa6d4cb9d194bdb04357972d3f4068f51c71
Reviewed-on: https://pdfium-review.googlesource.com/c/49290
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp
index 9d03218..309fc20 100644
--- a/core/fxcodec/codec/ccodec_bmpmodule.cpp
+++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp
@@ -52,7 +52,6 @@
pAttribute->m_wDPIUnit = FXCODEC_RESUNIT_METER;
pAttribute->m_nXDPI = ctx->m_Bmp.dpi_x_;
pAttribute->m_nYDPI = ctx->m_Bmp.dpi_y_;
- pAttribute->m_nBmpCompressType = ctx->m_Bmp.compress_flag_;
}
return 1;
}
diff --git a/core/fxcodec/codec/ccodec_gifmodule.cpp b/core/fxcodec/codec/ccodec_gifmodule.cpp
index fb81c05..a65393a 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.cpp
+++ b/core/fxcodec/codec/ccodec_gifmodule.cpp
@@ -28,8 +28,7 @@
int* height,
int* pal_num,
CFX_GifPalette** pal_pp,
- int* bg_index,
- CFX_DIBAttribute* pAttribute) {
+ int* bg_index) {
auto* context = static_cast<CFX_GifContext*>(pContext);
CFX_GifDecodeStatus ret = context->ReadHeader();
if (ret != CFX_GifDecodeStatus::Success)
@@ -54,17 +53,8 @@
}
CFX_GifDecodeStatus CCodec_GifModule::LoadFrame(Context* pContext,
- size_t frame_num,
- CFX_DIBAttribute* pAttribute) {
- auto* context = static_cast<CFX_GifContext*>(pContext);
- CFX_GifDecodeStatus ret = context->LoadFrame(frame_num);
- if (ret != CFX_GifDecodeStatus::Success)
- return ret;
-
- if (pAttribute)
- pAttribute->m_fAspectRatio = context->pixel_aspect_;
-
- return CFX_GifDecodeStatus::Success;
+ size_t frame_num) {
+ return static_cast<CFX_GifContext*>(pContext)->LoadFrame(frame_num);
}
FX_FILESIZE CCodec_GifModule::GetAvailInput(Context* pContext) const {
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h
index e044aa4..7d0fd67 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.h
+++ b/core/fxcodec/codec/ccodec_gifmodule.h
@@ -48,12 +48,9 @@
int* height,
int* pal_num,
CFX_GifPalette** pal_pp,
- int* bg_index,
- CFX_DIBAttribute* pAttribute);
+ int* bg_index);
std::pair<CFX_GifDecodeStatus, size_t> LoadFrameInfo(Context* context);
- CFX_GifDecodeStatus LoadFrame(Context* context,
- size_t frame_num,
- CFX_DIBAttribute* pAttribute);
+ CFX_GifDecodeStatus LoadFrame(Context* context, size_t frame_num);
};
#endif // CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.cpp b/core/fxcodec/codec/ccodec_progressivedecoder.cpp
index df84289..53f0ea9 100644
--- a/core/fxcodec/codec/ccodec_progressivedecoder.cpp
+++ b/core/fxcodec/codec/ccodec_progressivedecoder.cpp
@@ -858,8 +858,7 @@
return true;
}
-bool CCodec_ProgressiveDecoder::GifDetectImageTypeInBuffer(
- CFX_DIBAttribute* pAttribute) {
+bool CCodec_ProgressiveDecoder::GifDetectImageTypeInBuffer() {
CCodec_GifModule* pGifModule = m_pCodecMgr->GetGifModule();
if (!pGifModule) {
m_status = FXCODEC_STATUS_ERR_MEMORY;
@@ -868,9 +867,9 @@
m_pGifContext = pGifModule->Start(this);
pGifModule->Input(m_pGifContext.get(), m_pCodecMemory, nullptr);
m_SrcComponents = 1;
- CFX_GifDecodeStatus readResult = pGifModule->ReadHeader(
- m_pGifContext.get(), &m_SrcWidth, &m_SrcHeight, &m_GifPltNumber,
- &m_pGifPalette, &m_GifBgIndex, nullptr);
+ CFX_GifDecodeStatus readResult =
+ pGifModule->ReadHeader(m_pGifContext.get(), &m_SrcWidth, &m_SrcHeight,
+ &m_GifPltNumber, &m_pGifPalette, &m_GifBgIndex);
while (readResult == CFX_GifDecodeStatus::Unfinished) {
FXCODEC_STATUS error_status = FXCODEC_STATUS_ERR_FORMAT;
if (!GifReadMoreData(pGifModule, error_status)) {
@@ -878,9 +877,9 @@
m_status = error_status;
return false;
}
- readResult = pGifModule->ReadHeader(m_pGifContext.get(), &m_SrcWidth,
- &m_SrcHeight, &m_GifPltNumber,
- &m_pGifPalette, &m_GifBgIndex, nullptr);
+ readResult =
+ pGifModule->ReadHeader(m_pGifContext.get(), &m_SrcWidth, &m_SrcHeight,
+ &m_GifPltNumber, &m_pGifPalette, &m_GifBgIndex);
}
if (readResult == CFX_GifDecodeStatus::Success) {
m_SrcBPC = 8;
@@ -923,7 +922,7 @@
}
CFX_GifDecodeStatus readRes =
- pGifModule->LoadFrame(m_pGifContext.get(), m_FrameCur, nullptr);
+ pGifModule->LoadFrame(m_pGifContext.get(), m_FrameCur);
while (readRes == CFX_GifDecodeStatus::Unfinished) {
FXCODEC_STATUS error_status = FXCODEC_STATUS_DECODE_FINISH;
if (!GifReadMoreData(pGifModule, error_status)) {
@@ -932,7 +931,7 @@
m_status = error_status;
return m_status;
}
- readRes = pGifModule->LoadFrame(m_pGifContext.get(), m_FrameCur, nullptr);
+ readRes = pGifModule->LoadFrame(m_pGifContext.get(), m_FrameCur);
}
if (readRes == CFX_GifDecodeStatus::Success) {
@@ -1568,7 +1567,7 @@
#ifdef PDF_ENABLE_XFA_GIF
if (imageType == FXCODEC_IMAGE_GIF)
- return GifDetectImageTypeInBuffer(pAttribute);
+ return GifDetectImageTypeInBuffer();
#endif // PDF_ENABLE_XFA_GIF
#ifdef PDF_ENABLE_XFA_PNG
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h
index 413bd90..5430251 100644
--- a/core/fxcodec/codec/ccodec_progressivedecoder.h
+++ b/core/fxcodec/codec/ccodec_progressivedecoder.h
@@ -192,7 +192,7 @@
#ifdef PDF_ENABLE_XFA_GIF
bool GifReadMoreData(CCodec_GifModule* pGifModule,
FXCODEC_STATUS& err_status);
- bool GifDetectImageTypeInBuffer(CFX_DIBAttribute* pAttribute);
+ bool GifDetectImageTypeInBuffer();
FXCODEC_STATUS GifStartDecode(const RetainPtr<CFX_DIBitmap>& pDIBitmap);
FXCODEC_STATUS GifContinueDecode();
void GifDoubleLineResampleVert(const RetainPtr<CFX_DIBitmap>& pDeviceBitmap,
diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h
index 3b15fd7..03af915 100644
--- a/core/fxcodec/fx_codec.h
+++ b/core/fxcodec/fx_codec.h
@@ -55,13 +55,8 @@
CFX_DIBAttribute();
~CFX_DIBAttribute();
-#ifdef PDF_ENABLE_XFA_BMP
- int32_t m_nBmpCompressType = 0;
-#endif // PDF_ENABLE_XFA_BMP
-
int32_t m_nXDPI = -1;
int32_t m_nYDPI = -1;
- float m_fAspectRatio = -1.0f;
uint16_t m_wDPIUnit = 0;
std::map<uint32_t, void*> m_Exif;
};
diff --git a/core/fxcodec/gif/cfx_gifcontext.cpp b/core/fxcodec/gif/cfx_gifcontext.cpp
index 7a95863a..4808e44 100644
--- a/core/fxcodec/gif/cfx_gifcontext.cpp
+++ b/core/fxcodec/gif/cfx_gifcontext.cpp
@@ -32,7 +32,6 @@
width_(0),
height_(0),
bc_index_(0),
- pixel_aspect_(0),
global_sort_flag_(0),
global_color_resolution_(0),
img_pass_num_(0) {}
@@ -414,7 +413,6 @@
height_ = static_cast<int>(
FXWORD_GET_LSBFIRST(reinterpret_cast<uint8_t*>(&lsd.height)));
- pixel_aspect_ = lsd.pixel_aspect;
return CFX_GifDecodeStatus::Success;
}
diff --git a/core/fxcodec/gif/cfx_gifcontext.h b/core/fxcodec/gif/cfx_gifcontext.h
index 2bb2adc..73d77f6 100644
--- a/core/fxcodec/gif/cfx_gifcontext.h
+++ b/core/fxcodec/gif/cfx_gifcontext.h
@@ -58,7 +58,6 @@
int width_;
int height_;
uint8_t bc_index_;
- uint8_t pixel_aspect_;
uint8_t global_sort_flag_;
uint8_t global_color_resolution_;
uint8_t img_pass_num_;
diff --git a/core/fxcodec/gif/cfx_gifcontext_unittest.cpp b/core/fxcodec/gif/cfx_gifcontext_unittest.cpp
index aa18467..c26d1cc 100644
--- a/core/fxcodec/gif/cfx_gifcontext_unittest.cpp
+++ b/core/fxcodec/gif/cfx_gifcontext_unittest.cpp
@@ -164,7 +164,6 @@
EXPECT_EQ(0, context.width_);
EXPECT_EQ(0, context.height_);
EXPECT_EQ(0u, context.bc_index_);
- EXPECT_EQ(0u, context.pixel_aspect_);
context.SetTestInputBuffer({});
}
// LSD with no global palette
@@ -181,7 +180,6 @@
EXPECT_EQ(0x000A, context.width_);
EXPECT_EQ(0x0F00, context.height_);
EXPECT_EQ(0u, context.bc_index_); // bc_index_ is 0 if no global palette
- EXPECT_EQ(2u, context.pixel_aspect_);
context.SetTestInputBuffer({});
}
// LSD with global palette bit set, but no global palette
@@ -213,7 +211,6 @@
EXPECT_EQ(0x000A, context.width_);
EXPECT_EQ(0x0F00, context.height_);
EXPECT_EQ(1u, context.bc_index_);
- EXPECT_EQ(2u, context.pixel_aspect_);
EXPECT_EQ(1u, context.global_pal_exp_);
EXPECT_EQ(1, context.global_sort_flag_);
EXPECT_EQ(2, context.global_color_resolution_);
@@ -264,7 +261,6 @@
EXPECT_EQ(0x000A, context.width_);
EXPECT_EQ(0x0F00, context.height_);
EXPECT_EQ(0u, context.bc_index_); // bc_index_ is 0 if no global palette
- EXPECT_EQ(2u, context.pixel_aspect_);
context.SetTestInputBuffer({});
}
// Missing Global Palette
@@ -298,7 +294,6 @@
EXPECT_EQ(0x000A, context.width_);
EXPECT_EQ(0x0F00, context.height_);
EXPECT_EQ(1u, context.bc_index_);
- EXPECT_EQ(2u, context.pixel_aspect_);
EXPECT_EQ(1u, context.global_pal_exp_);
EXPECT_EQ(1, context.global_sort_flag_);
EXPECT_EQ(2, context.global_color_resolution_);
