From 87b67f842fe53c3d5db553b6c1965f4588fecbfc Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 11 Apr 2018 23:31:29 +0000 Subject: Remove CFX_DIBAttribute::m_strAuthor It is set in a couple of places, but the value is never used for any purpose. Change-Id: I6fc0839bc14b21ee8217fcb3eadf6c252ad67aa7 Reviewed-on: https://pdfium-review.googlesource.com/30330 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxcodec/codec/ccodec_gifmodule.cpp | 10 ---------- core/fxcodec/codec/ccodec_pngmodule.cpp | 17 ----------------- core/fxcodec/fx_codec.h | 1 - 3 files changed, 28 deletions(-) diff --git a/core/fxcodec/codec/ccodec_gifmodule.cpp b/core/fxcodec/codec/ccodec_gifmodule.cpp index d6ab10d9c9..dc2c0c83a4 100644 --- a/core/fxcodec/codec/ccodec_gifmodule.cpp +++ b/core/fxcodec/codec/ccodec_gifmodule.cpp @@ -63,16 +63,6 @@ CFX_GifDecodeStatus CCodec_GifModule::LoadFrame(Context* pContext, pAttribute->m_nGifLeft = context->images_[frame_num]->image_info.left; pAttribute->m_nGifTop = context->images_[frame_num]->image_info.top; pAttribute->m_fAspectRatio = context->pixel_aspect_; - const uint8_t* buf = - reinterpret_cast(context->cmt_data_.GetBuffer(0)); - uint32_t len = context->cmt_data_.GetLength(); - if (len > 21) { - uint8_t size = *buf++; - if (size != 0) - pAttribute->m_strAuthor = ByteString(buf, size); - else - pAttribute->m_strAuthor.clear(); - } return CFX_GifDecodeStatus::Success; } diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index db5886aa29..7aedf2ee7f 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -75,26 +75,9 @@ static void _png_load_bmp_attribute(png_structp png_ptr, &icc_proflen); #endif #if defined(PNG_TEXT_SUPPORTED) - int i; - size_t len; - const char* buf; int num_text; png_textp text = nullptr; png_get_text(png_ptr, info_ptr, &text, &num_text); - for (i = 0; i < num_text; i++) { - len = strlen(text[i].key); - buf = "Time"; - if (memcmp(buf, text[i].key, std::min(len, strlen(buf)))) { - buf = "Author"; - if (!memcmp(buf, text[i].key, std::min(len, strlen(buf)))) { - pAttribute->m_strAuthor = - text[i].text_length > 0 - ? ByteString(reinterpret_cast(text[i].text), - static_cast(text[i].text_length)) - : ByteString(); - } - } - } #endif } } diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h index 923eb7cb71..e64d95f45f 100644 --- a/core/fxcodec/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -45,7 +45,6 @@ class CFX_DIBAttribute { int32_t m_nYDPI; float m_fAspectRatio; uint16_t m_wDPIUnit; - ByteString m_strAuthor; int32_t m_nGifLeft; int32_t m_nGifTop; uint32_t* m_pGifLocalPalette; -- cgit v1.2.3