summaryrefslogtreecommitdiff
path: root/fxbarcode
diff options
context:
space:
mode:
authorHenrique Nakashima <hnakashima@chromium.org>2018-08-21 19:50:17 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-21 19:50:17 +0000
commitdc2bb9ad21a10550fb451d7c842c63cbce98045b (patch)
treecced6e8df7fdbd424dcc6a4dd9c4f145645fc31c /fxbarcode
parentaa58fb5759b937760464a2e63f19f464cd1cfe52 (diff)
downloadpdfium-dc2bb9ad21a10550fb451d7c842c63cbce98045b.tar.xz
Optimize rendering of two dimensional barcodes: defer upscale.
Defer upscaling as late as possible so that intermediary data structures are smaller. Made a couple of changes along the way to preserve the barcode correctness and fix some padding issues. For my example, this is a ~21x improvement in rendering time, down from ~190ms per barcode to ~9ms. Bug: 872907, pdfium:1135 Change-Id: If532e0f168f02fea9c31d473f34c0009da4f4612 Reviewed-on: https://pdfium-review.googlesource.com/40010 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'fxbarcode')
-rw-r--r--fxbarcode/BC_TwoDimWriter.cpp101
-rw-r--r--fxbarcode/BC_TwoDimWriter.h10
-rw-r--r--fxbarcode/common/BC_CommonBitMatrix.cpp4
3 files changed, 69 insertions, 46 deletions
diff --git a/fxbarcode/BC_TwoDimWriter.cpp b/fxbarcode/BC_TwoDimWriter.cpp
index 09f39c2443..36e554c6cf 100644
--- a/fxbarcode/BC_TwoDimWriter.cpp
+++ b/fxbarcode/BC_TwoDimWriter.cpp
@@ -21,32 +21,41 @@ CBC_TwoDimWriter::~CBC_TwoDimWriter() {}
void CBC_TwoDimWriter::RenderDeviceResult(CFX_RenderDevice* device,
const CFX_Matrix* matrix) {
+ ASSERT(m_output);
+
CFX_GraphStateData stateData;
CFX_PathData path;
path.AppendRect(0, 0, (float)m_Width, (float)m_Height);
device->DrawPath(&path, matrix, &stateData, m_backgroundColor,
m_backgroundColor, FXFILL_ALTERNATE);
- int32_t leftPos = 0;
- int32_t topPos = 0;
- if (m_bFixedSize) {
- leftPos = (m_Width - m_output->GetWidth()) / 2;
- topPos = (m_Height - m_output->GetHeight()) / 2;
- }
+ int32_t leftPos = m_leftPadding;
+ int32_t topPos = m_topPadding;
+
CFX_Matrix matri = *matrix;
- if (m_Width < m_output->GetWidth() && m_Height < m_output->GetHeight()) {
- CFX_Matrix matriScale((float)m_Width / (float)m_output->GetWidth(), 0.0,
- 0.0, (float)m_Height / (float)m_output->GetHeight(),
- 0.0, 0.0);
+ if (m_Width < m_outputWidth && m_Height < m_outputHeight) {
+ CFX_Matrix matriScale(static_cast<float>(m_Width) / m_outputWidth, 0.0, 0.0,
+ static_cast<float>(m_Height) / m_outputHeight, 0.0,
+ 0.0);
matriScale.Concat(*matrix);
matri = matriScale;
}
- for (int32_t x = 0; x < m_output->GetWidth(); x++) {
- for (int32_t y = 0; y < m_output->GetHeight(); y++) {
+
+ CFX_GraphStateData data;
+ for (int32_t x = 0; x < m_inputWidth; x++) {
+ for (int32_t y = 0; y < m_inputHeight; y++) {
if (m_output->Get(x, y)) {
- CFX_GraphStateData data;
+ // In the output, each module is shifted by 1 due to the one module
+ // padding added to create quiet areas.
+ int start_x_output = x + 1;
+ int end_x_output = x + 2;
+ int start_y_output = y + 1;
+ int end_y_output = y + 2;
+
CFX_PathData rect;
- rect.AppendRect((float)leftPos + x, (float)topPos + y,
- (float)(leftPos + x + 1), (float)(topPos + y + 1));
+ rect.AppendRect(leftPos + start_x_output * m_multiX,
+ topPos + start_y_output * m_multiY,
+ leftPos + end_x_output * m_multiX,
+ topPos + end_y_output * m_multiY);
device->DrawPath(&rect, &matri, &data, m_barColor, 0, FXFILL_WINDING);
}
}
@@ -60,10 +69,10 @@ int32_t CBC_TwoDimWriter::GetErrorCorrectionLevel() const {
bool CBC_TwoDimWriter::RenderResult(uint8_t* code,
int32_t codeWidth,
int32_t codeHeight) {
- int32_t inputWidth = codeWidth;
- int32_t inputHeight = codeHeight;
- int32_t tempWidth = inputWidth + 2;
- int32_t tempHeight = inputHeight + 2;
+ m_inputWidth = codeWidth;
+ m_inputHeight = codeHeight;
+ int32_t tempWidth = m_inputWidth + 2;
+ int32_t tempHeight = m_inputHeight + 2;
float moduleHSize = std::min(m_ModuleWidth, m_ModuleHeight);
moduleHSize = std::min(moduleHSize, 8.0f);
moduleHSize = std::max(moduleHSize, 1.0f);
@@ -71,41 +80,45 @@ bool CBC_TwoDimWriter::RenderResult(uint8_t* code,
pdfium::base::CheckedNumeric<int32_t> scaledHeight = tempHeight;
scaledWidth *= moduleHSize;
scaledHeight *= moduleHSize;
+ m_outputWidth = scaledWidth.ValueOrDie();
+ m_outputHeight = scaledHeight.ValueOrDie();
- int32_t outputWidth = scaledWidth.ValueOrDie();
- int32_t outputHeight = scaledHeight.ValueOrDie();
if (m_bFixedSize) {
- if (m_Width < outputWidth || m_Height < outputHeight) {
+ if (m_Width < m_outputWidth || m_Height < m_outputHeight) {
return false;
}
} else {
- if (m_Width > outputWidth || m_Height > outputHeight) {
- outputWidth =
- (int32_t)(outputWidth * ceil((float)m_Width / (float)outputWidth));
- outputHeight =
- (int32_t)(outputHeight * ceil((float)m_Height / (float)outputHeight));
+ if (m_Width > m_outputWidth || m_Height > m_outputHeight) {
+ int32_t width_factor = static_cast<int32_t>(
+ floor(static_cast<float>(m_Width) / m_outputWidth));
+ int32_t height_factor = static_cast<int32_t>(
+ floor(static_cast<float>(m_Height) / m_outputHeight));
+ width_factor = std::max(width_factor, 1);
+ height_factor = std::max(height_factor, 1);
+
+ m_outputWidth *= width_factor;
+ m_outputHeight *= height_factor;
}
}
- int32_t multiX = (int32_t)ceil((float)outputWidth / (float)tempWidth);
- int32_t multiY = (int32_t)ceil((float)outputHeight / (float)tempHeight);
+ m_multiX =
+ static_cast<int32_t>(ceil(static_cast<float>(m_outputWidth) / tempWidth));
+ m_multiY = static_cast<int32_t>(
+ ceil(static_cast<float>(m_outputHeight) / tempHeight));
if (m_bFixedSize) {
- multiX = std::min(multiX, multiY);
- multiY = multiX;
+ m_multiX = std::min(m_multiX, m_multiY);
+ m_multiY = m_multiX;
}
- int32_t leftPadding = std::max((outputWidth - (inputWidth * multiX)) / 2, 0);
- int32_t topPadding = std::max((outputHeight - (inputHeight * multiY)) / 2, 0);
+
+ m_leftPadding = std::max((m_Width - m_outputWidth) / 2, 0);
+ m_topPadding = std::max((m_Height - m_outputHeight) / 2, 0);
+
m_output = pdfium::MakeUnique<CBC_CommonBitMatrix>();
- m_output->Init(outputWidth, outputHeight);
- for (int32_t inputY = 0, outputY = topPadding;
- (inputY < inputHeight) && (outputY < outputHeight - multiY);
- inputY++, outputY += multiY) {
- for (int32_t inputX = 0, outputX = leftPadding;
- (inputX < inputWidth) && (outputX < outputWidth - multiX);
- inputX++, outputX += multiX) {
- if (code[inputX + inputY * inputWidth] == 1 &&
- !m_output->SetRegion(outputX, outputY, multiX, multiY)) {
- return false;
- }
+ m_output->Init(m_inputWidth, m_inputHeight);
+
+ for (int32_t y = 0; y < m_inputHeight; ++y) {
+ for (int32_t x = 0; x < m_inputWidth; ++x) {
+ if (code[x + y * m_inputWidth] == 1)
+ m_output->Set(x, y);
}
}
return true;
diff --git a/fxbarcode/BC_TwoDimWriter.h b/fxbarcode/BC_TwoDimWriter.h
index e554805fcf..228a2e03e9 100644
--- a/fxbarcode/BC_TwoDimWriter.h
+++ b/fxbarcode/BC_TwoDimWriter.h
@@ -31,7 +31,17 @@ class CBC_TwoDimWriter : public CBC_Writer {
protected:
int32_t m_iCorrectLevel;
bool m_bFixedSize;
+
+ private:
std::unique_ptr<CBC_CommonBitMatrix> m_output;
+ int32_t m_multiX;
+ int32_t m_multiY;
+ int32_t m_leftPadding;
+ int32_t m_topPadding;
+ int32_t m_inputWidth;
+ int32_t m_inputHeight;
+ int32_t m_outputWidth;
+ int32_t m_outputHeight;
};
#endif // FXBARCODE_BC_TWODIMWRITER_H_
diff --git a/fxbarcode/common/BC_CommonBitMatrix.cpp b/fxbarcode/common/BC_CommonBitMatrix.cpp
index a8a6e53bc1..54b1affa71 100644
--- a/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -59,8 +59,8 @@ bool CBC_CommonBitMatrix::Get(int32_t x, int32_t y) const {
void CBC_CommonBitMatrix::Set(int32_t x, int32_t y) {
int32_t offset = y * m_rowSize + (x >> 5);
- if (offset >= m_rowSize * m_height || offset < 0)
- return;
+ ASSERT(offset >= 0);
+ ASSERT(offset < m_rowSize * m_height);
m_bits[offset] |= 1 << (x & 0x1f);
}