Remove repetitive |FXTEXT_CLEARTYPE| usages in fxbarcode/oned/.
In fxbarcode/oned/ directory, class CBC_OneDimWriter and all of its
subclasses use |FXTEXT_CLEARTYPE| as their text rendering options.
This CL adds a static method CBC_OneDimWriter::GetTextRenderOptions()
to replace the repetitive usages of |FXTEXT_CLEARTYPE|, which will help
reduce code changes when cleaning up FXTEXT_* flags in the future.
Bug: pdfium:1531
Change-Id: I7417ca968fc05564fbb1cb54bac6f242d6834db5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70132
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Hui Yingst <nigi@chromium.org>
diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp
index 33d6ebf..8634ecd 100644
--- a/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -37,6 +37,11 @@
#include "fxbarcode/BC_Writer.h"
// static
+uint32_t CBC_OneDimWriter::GetTextRenderOptions() {
+ return FXTEXT_CLEARTYPE;
+}
+
+// static
bool CBC_OneDimWriter::HasValidContentSize(WideStringView contents) {
// Limit the size of 1D barcodes. Typical 1D barcodes are short so this should
// be sufficient for most use cases.
@@ -184,7 +189,7 @@
}
device->DrawNormalText(str.GetLength(), pCharPos, m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
bool CBC_OneDimWriter::ShowChars(WideStringView contents,
diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index 338e34e..da9b086 100644
--- a/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -22,6 +22,7 @@
class CBC_OneDimWriter : public CBC_Writer {
public:
+ static uint32_t GetTextRenderOptions();
static bool HasValidContentSize(WideStringView contents);
CBC_OneDimWriter();
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 871efa8..2e68114 100644
--- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -180,7 +180,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, &charpos[1], m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
tempStr = str.Substr(7, 6);
length = tempStr.GetLength();
@@ -195,7 +195,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, &charpos[7], m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
tempStr = str.First(1);
length = tempStr.GetLength();
@@ -211,7 +211,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, charpos.data(), m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
return true;
}
diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 1825491..9826054 100644
--- a/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -171,7 +171,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(iLen, charpos.data(), m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
tempStr = str.Substr(4, 4);
iLen = tempStr.GetLength();
@@ -186,7 +186,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(iLen, &charpos[4], m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
return true;
}
diff --git a/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index c3daa3c..b344999 100644
--- a/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -162,7 +162,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, &charpos[1], m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
tempStr = str.Substr(6, 5);
length = tempStr.GetLength();
@@ -176,7 +176,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, &charpos[6], m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
tempStr = str.First(1);
length = tempStr.GetLength();
@@ -192,7 +192,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, charpos.data(), m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
tempStr = str.Substr(11, 1);
length = tempStr.GetLength();
@@ -207,7 +207,7 @@
affine_matrix1.Concat(*matrix);
device->DrawNormalText(length, &charpos[11], m_pFont.Get(),
static_cast<float>(iFontSize), affine_matrix1,
- m_fontColor, FXTEXT_CLEARTYPE);
+ m_fontColor, GetTextRenderOptions());
}
return true;
}
