Rename CPDF_DIBTransferFunc to CPDF_TransferFuncDIB.
The class is a device independent bitmap, not a transfer function.
Change-Id: I248f360a4f3a77e2bb3a2880c6ebd8edc69b8b8d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65094
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/BUILD.gn b/core/fpdfapi/page/BUILD.gn
index 22ca2fb..2a91b0c 100644
--- a/core/fpdfapi/page/BUILD.gn
+++ b/core/fpdfapi/page/BUILD.gn
@@ -29,8 +29,6 @@
"cpdf_devicecs.h",
"cpdf_dib.cpp",
"cpdf_dib.h",
- "cpdf_dibtransferfunc.cpp",
- "cpdf_dibtransferfunc.h",
"cpdf_docpagedata.cpp",
"cpdf_docpagedata.h",
"cpdf_expintfunc.cpp",
@@ -95,6 +93,8 @@
"cpdf_tilingpattern.h",
"cpdf_transferfunc.cpp",
"cpdf_transferfunc.h",
+ "cpdf_transferfuncdib.cpp",
+ "cpdf_transferfuncdib.h",
"cpdf_transparency.cpp",
"cpdf_transparency.h",
"ipdf_page.h",
diff --git a/core/fpdfapi/page/cpdf_transferfunc.cpp b/core/fpdfapi/page/cpdf_transferfunc.cpp
index 91b08bc..4cc2d87 100644
--- a/core/fpdfapi/page/cpdf_transferfunc.cpp
+++ b/core/fpdfapi/page/cpdf_transferfunc.cpp
@@ -8,7 +8,7 @@
#include <utility>
-#include "core/fpdfapi/page/cpdf_dibtransferfunc.h"
+#include "core/fpdfapi/page/cpdf_transferfuncdib.h"
#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fxge/dib/cfx_dibbase.h"
@@ -38,7 +38,7 @@
RetainPtr<CFX_DIBBase> CPDF_TransferFunc::TranslateImage(
const RetainPtr<CFX_DIBBase>& pSrc) {
RetainPtr<CPDF_TransferFunc> pHolder(this);
- auto pDest = pdfium::MakeRetain<CPDF_DIBTransferFunc>(pHolder);
+ auto pDest = pdfium::MakeRetain<CPDF_TransferFuncDIB>(pHolder);
pDest->LoadSrc(pSrc);
return pDest;
}
diff --git a/core/fpdfapi/page/cpdf_dibtransferfunc.cpp b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
similarity index 90%
rename from core/fpdfapi/page/cpdf_dibtransferfunc.cpp
rename to core/fpdfapi/page/cpdf_transferfuncdib.cpp
index d675e42..23d7ea1 100644
--- a/core/fpdfapi/page/cpdf_dibtransferfunc.cpp
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/page/cpdf_dibtransferfunc.h"
+#include "core/fpdfapi/page/cpdf_transferfuncdib.h"
#include <vector>
@@ -13,16 +13,16 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "third_party/base/compiler_specific.h"
-CPDF_DIBTransferFunc::CPDF_DIBTransferFunc(
+CPDF_TransferFuncDIB::CPDF_TransferFuncDIB(
const RetainPtr<CPDF_TransferFunc>& pTransferFunc)
: m_pTransferFunc(pTransferFunc),
m_RampR(pTransferFunc->GetSamplesR()),
m_RampG(pTransferFunc->GetSamplesG()),
m_RampB(pTransferFunc->GetSamplesB()) {}
-CPDF_DIBTransferFunc::~CPDF_DIBTransferFunc() = default;
+CPDF_TransferFuncDIB::~CPDF_TransferFuncDIB() = default;
-FXDIB_Format CPDF_DIBTransferFunc::GetDestFormat() {
+FXDIB_Format CPDF_TransferFuncDIB::GetDestFormat() {
if (m_pSrc->IsAlphaMask())
return FXDIB_8bppMask;
@@ -33,11 +33,11 @@
#endif
}
-FX_ARGB* CPDF_DIBTransferFunc::GetDestPalette() {
+FX_ARGB* CPDF_TransferFuncDIB::GetDestPalette() {
return nullptr;
}
-void CPDF_DIBTransferFunc::TranslateScanline(
+void CPDF_TransferFuncDIB::TranslateScanline(
const uint8_t* src_buf,
std::vector<uint8_t>* dest_buf) const {
bool bSkip = false;
@@ -143,7 +143,7 @@
}
}
-void CPDF_DIBTransferFunc::TranslateDownSamples(uint8_t* dest_buf,
+void CPDF_TransferFuncDIB::TranslateDownSamples(uint8_t* dest_buf,
const uint8_t* src_buf,
int pixels,
int Bpp) const {
@@ -180,7 +180,7 @@
}
}
-void CPDF_DIBTransferFunc::LoadSrc(const RetainPtr<CFX_DIBBase>& pSrc) {
+void CPDF_TransferFuncDIB::LoadSrc(const RetainPtr<CFX_DIBBase>& pSrc) {
m_pSrc = pSrc;
m_Width = pSrc->GetWidth();
m_Height = pSrc->GetHeight();
@@ -192,12 +192,12 @@
m_Scanline.resize(m_Pitch);
}
-const uint8_t* CPDF_DIBTransferFunc::GetScanline(int line) const {
+const uint8_t* CPDF_TransferFuncDIB::GetScanline(int line) const {
TranslateScanline(m_pSrc->GetScanline(line), &m_Scanline);
return m_Scanline.data();
}
-void CPDF_DIBTransferFunc::DownSampleScanline(int line,
+void CPDF_TransferFuncDIB::DownSampleScanline(int line,
uint8_t* dest_scan,
int dest_bpp,
int dest_width,
diff --git a/core/fpdfapi/page/cpdf_dibtransferfunc.h b/core/fpdfapi/page/cpdf_transferfuncdib.h
similarity index 85%
rename from core/fpdfapi/page/cpdf_dibtransferfunc.h
rename to core/fpdfapi/page/cpdf_transferfuncdib.h
index cad79a4..4c22709 100644
--- a/core/fpdfapi/page/cpdf_dibtransferfunc.h
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_PAGE_CPDF_DIBTRANSFERFUNC_H_
-#define CORE_FPDFAPI_PAGE_CPDF_DIBTRANSFERFUNC_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_TRANSFERFUNCDIB_H_
+#define CORE_FPDFAPI_PAGE_CPDF_TRANSFERFUNCDIB_H_
#include <vector>
@@ -15,7 +15,7 @@
class CPDF_TransferFunc;
-class CPDF_DIBTransferFunc final : public CFX_DIBBase {
+class CPDF_TransferFuncDIB final : public CFX_DIBBase {
public:
template <typename T, typename... Args>
friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
@@ -31,9 +31,9 @@
void LoadSrc(const RetainPtr<CFX_DIBBase>& pSrc);
private:
- explicit CPDF_DIBTransferFunc(
+ explicit CPDF_TransferFuncDIB(
const RetainPtr<CPDF_TransferFunc>& pTransferFunc);
- ~CPDF_DIBTransferFunc() override;
+ ~CPDF_TransferFuncDIB() override;
// CFX_DIBBase:
const uint8_t* GetScanline(int line) const override;
@@ -53,4 +53,4 @@
const pdfium::span<const uint8_t> m_RampB;
};
-#endif // CORE_FPDFAPI_PAGE_CPDF_DIBTRANSFERFUNC_H_
+#endif // CORE_FPDFAPI_PAGE_CPDF_TRANSFERFUNCDIB_H_
