Use Google C++ variable names in CPDF_TransferFuncDIB
- Use the preferred style.
- Flip a conditional logic to be positive.
Change-Id: Ic20055b3b567bf9a7464cc3cdc4a9618da503e28
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/121571
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_transferfuncdib.cpp b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
index b2b353a..460f59f 100644
--- a/core/fpdfapi/page/cpdf_transferfuncdib.cpp
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
@@ -22,29 +22,31 @@
#endif
CPDF_TransferFuncDIB::CPDF_TransferFuncDIB(
- RetainPtr<CFX_DIBBase> pSrc,
- RetainPtr<CPDF_TransferFunc> pTransferFunc)
- : m_pSrc(std::move(pSrc)),
- m_pTransferFunc(std::move(pTransferFunc)),
- m_RampR(m_pTransferFunc->GetSamplesR()),
- m_RampG(m_pTransferFunc->GetSamplesG()),
- m_RampB(m_pTransferFunc->GetSamplesB()) {
- SetWidth(m_pSrc->GetWidth());
- SetHeight(m_pSrc->GetHeight());
+ RetainPtr<const CFX_DIBBase> src,
+ RetainPtr<CPDF_TransferFunc> transfer_func)
+ : src_(std::move(src)),
+ transfer_func_(std::move(transfer_func)),
+ r_samples_(transfer_func_->GetSamplesR()),
+ g_samples_(transfer_func_->GetSamplesG()),
+ b_samples_(transfer_func_->GetSamplesB()) {
+ SetWidth(src_->GetWidth());
+ SetHeight(src_->GetHeight());
SetFormat(GetDestFormat());
SetPitch(fxge::CalculatePitch32OrDie(GetBPP(), GetWidth()));
- m_Scanline.resize(GetPitch());
+ scanline_.resize(GetPitch());
CHECK(!HasPalette());
}
CPDF_TransferFuncDIB::~CPDF_TransferFuncDIB() = default;
FXDIB_Format CPDF_TransferFuncDIB::GetDestFormat() const {
- if (m_pSrc->IsMaskFormat())
+ if (src_->IsMaskFormat()) {
return FXDIB_Format::k8bppMask;
+ }
- if (m_pSrc->IsAlphaFormat())
+ if (src_->IsAlphaFormat()) {
return FXDIB_Format::kArgb;
+ }
return CFX_DIBBase::kPlatformRGBFormat;
}
@@ -52,29 +54,29 @@
void CPDF_TransferFuncDIB::TranslateScanline(
pdfium::span<const uint8_t> src_span) const {
const uint8_t* src_buf = src_span.data();
- bool bSkip = false;
- switch (m_pSrc->GetFormat()) {
+ bool skip = false;
+ switch (src_->GetFormat()) {
case FXDIB_Format::kInvalid: {
break;
}
case FXDIB_Format::k1bppRgb: {
- int r0 = m_RampR[0];
- int g0 = m_RampG[0];
- int b0 = m_RampB[0];
- int r1 = m_RampR[255];
- int g1 = m_RampG[255];
- int b1 = m_RampB[255];
+ int r0 = r_samples_[0];
+ int g0 = g_samples_[0];
+ int b0 = b_samples_[0];
+ int r1 = r_samples_[255];
+ int g1 = g_samples_[255];
+ int b1 = b_samples_[255];
int index = 0;
UNSAFE_TODO({
for (int i = 0; i < GetWidth(); i++) {
if (src_buf[i / 8] & (1 << (7 - i % 8))) {
- m_Scanline[index++] = b1;
- m_Scanline[index++] = g1;
- m_Scanline[index++] = r1;
+ scanline_[index++] = b1;
+ scanline_[index++] = g1;
+ scanline_[index++] = r1;
} else {
- m_Scanline[index++] = b0;
- m_Scanline[index++] = g0;
- m_Scanline[index++] = r0;
+ scanline_[index++] = b0;
+ scanline_[index++] = g0;
+ scanline_[index++] = r0;
}
INCR_ON_APPLE(index);
}
@@ -82,35 +84,35 @@
break;
}
case FXDIB_Format::k1bppMask: {
- int m0 = m_RampR[0];
- int m1 = m_RampR[255];
+ int m0 = r_samples_[0];
+ int m1 = r_samples_[255];
int index = 0;
UNSAFE_TODO({
for (int i = 0; i < GetWidth(); i++) {
if (src_buf[i / 8] & (1 << (7 - i % 8))) {
- m_Scanline[index++] = m1;
+ scanline_[index++] = m1;
} else {
- m_Scanline[index++] = m0;
+ scanline_[index++] = m0;
}
}
});
break;
}
case FXDIB_Format::k8bppRgb: {
- pdfium::span<const uint32_t> src_palette = m_pSrc->GetPaletteSpan();
+ pdfium::span<const uint32_t> src_palette = src_->GetPaletteSpan();
int index = 0;
UNSAFE_TODO({
for (int i = 0; i < GetWidth(); i++) {
- if (m_pSrc->HasPalette()) {
+ if (src_->HasPalette()) {
FX_ARGB src_argb = src_palette[*src_buf];
- m_Scanline[index++] = m_RampB[FXARGB_R(src_argb)];
- m_Scanline[index++] = m_RampG[FXARGB_G(src_argb)];
- m_Scanline[index++] = m_RampR[FXARGB_B(src_argb)];
+ scanline_[index++] = b_samples_[FXARGB_R(src_argb)];
+ scanline_[index++] = g_samples_[FXARGB_G(src_argb)];
+ scanline_[index++] = r_samples_[FXARGB_B(src_argb)];
} else {
uint32_t src_byte = *src_buf;
- m_Scanline[index++] = m_RampB[src_byte];
- m_Scanline[index++] = m_RampG[src_byte];
- m_Scanline[index++] = m_RampR[src_byte];
+ scanline_[index++] = b_samples_[src_byte];
+ scanline_[index++] = g_samples_[src_byte];
+ scanline_[index++] = r_samples_[src_byte];
}
src_buf++;
INCR_ON_APPLE(index);
@@ -122,7 +124,7 @@
int index = 0;
UNSAFE_TODO({
for (int i = 0; i < GetWidth(); i++) {
- m_Scanline[index++] = m_RampR[*(src_buf++)];
+ scanline_[index++] = r_samples_[*(src_buf++)];
}
});
break;
@@ -131,28 +133,28 @@
int index = 0;
UNSAFE_TODO({
for (int i = 0; i < GetWidth(); i++) {
- m_Scanline[index++] = m_RampB[*(src_buf++)];
- m_Scanline[index++] = m_RampG[*(src_buf++)];
- m_Scanline[index++] = m_RampR[*(src_buf++)];
+ scanline_[index++] = b_samples_[*(src_buf++)];
+ scanline_[index++] = g_samples_[*(src_buf++)];
+ scanline_[index++] = r_samples_[*(src_buf++)];
INCR_ON_APPLE(index);
}
});
break;
}
case FXDIB_Format::kRgb32:
- bSkip = true;
+ skip = true;
[[fallthrough]];
case FXDIB_Format::kArgb: {
int index = 0;
UNSAFE_TODO({
for (int i = 0; i < GetWidth(); i++) {
- m_Scanline[index++] = m_RampB[*(src_buf++)];
- m_Scanline[index++] = m_RampG[*(src_buf++)];
- m_Scanline[index++] = m_RampR[*(src_buf++)];
- if (!bSkip) {
- m_Scanline[index++] = *src_buf;
- } else {
+ scanline_[index++] = b_samples_[*(src_buf++)];
+ scanline_[index++] = g_samples_[*(src_buf++)];
+ scanline_[index++] = r_samples_[*(src_buf++)];
+ if (skip) {
INCR_ON_APPLE(index);
+ } else {
+ scanline_[index++] = *src_buf;
}
src_buf++;
}
@@ -163,6 +165,6 @@
}
pdfium::span<const uint8_t> CPDF_TransferFuncDIB::GetScanline(int line) const {
- TranslateScanline(m_pSrc->GetScanline(line));
- return m_Scanline;
+ TranslateScanline(src_->GetScanline(line));
+ return scanline_;
}
diff --git a/core/fpdfapi/page/cpdf_transferfuncdib.h b/core/fpdfapi/page/cpdf_transferfuncdib.h
index 36cf84d..b81d56b 100644
--- a/core/fpdfapi/page/cpdf_transferfuncdib.h
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.h
@@ -25,19 +25,19 @@
pdfium::span<const uint8_t> GetScanline(int line) const override;
private:
- CPDF_TransferFuncDIB(RetainPtr<CFX_DIBBase> pSrc,
- RetainPtr<CPDF_TransferFunc> pTransferFunc);
+ CPDF_TransferFuncDIB(RetainPtr<const CFX_DIBBase> src,
+ RetainPtr<CPDF_TransferFunc> transfer_func);
~CPDF_TransferFuncDIB() override;
void TranslateScanline(pdfium::span<const uint8_t> src_span) const;
FXDIB_Format GetDestFormat() const;
- RetainPtr<CFX_DIBBase> const m_pSrc;
- RetainPtr<CPDF_TransferFunc> const m_pTransferFunc;
- const pdfium::raw_span<const uint8_t> m_RampR;
- const pdfium::raw_span<const uint8_t> m_RampG;
- const pdfium::raw_span<const uint8_t> m_RampB;
- mutable DataVector<uint8_t> m_Scanline;
+ RetainPtr<const CFX_DIBBase> const src_;
+ RetainPtr<CPDF_TransferFunc> const transfer_func_;
+ const pdfium::raw_span<const uint8_t> r_samples_;
+ const pdfium::raw_span<const uint8_t> g_samples_;
+ const pdfium::raw_span<const uint8_t> b_samples_;
+ mutable DataVector<uint8_t> scanline_;
};
#endif // CORE_FPDFAPI_PAGE_CPDF_TRANSFERFUNCDIB_H_
