Rename TextGlyphPos::m_fOrigin to m_fDeviceOrigin
Avoid conflict with m_Origin in absence of Hungarian prefix.
Change-Id: I53a37551844ac355381db512154b53e1a2dea745
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69612
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index 69f6c56..c1eba0c 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -45,12 +45,13 @@
for (size_t i = glyphs.size() - 1; i > 1; --i) {
const TextGlyphPos& next = glyphs[i];
int next_origin = bVertical ? next.m_Origin.y : next.m_Origin.x;
- float next_origin_f = bVertical ? next.m_fOrigin.y : next.m_fOrigin.x;
+ float next_origin_f =
+ bVertical ? next.m_fDeviceOrigin.y : next.m_fDeviceOrigin.x;
TextGlyphPos& current = glyphs[i - 1];
int& current_origin = bVertical ? current.m_Origin.y : current.m_Origin.x;
float current_origin_f =
- bVertical ? current.m_fOrigin.y : current.m_fOrigin.x;
+ bVertical ? current.m_fDeviceOrigin.y : current.m_fDeviceOrigin.x;
FX_SAFE_INT32 safe_space = next_origin;
safe_space -= current_origin;
@@ -922,12 +923,12 @@
TextGlyphPos& glyph = glyphs[i];
const TextCharPos& charpos = pCharPos[i];
- glyph.m_fOrigin = text2Device.Transform(charpos.m_Origin);
+ glyph.m_fDeviceOrigin = text2Device.Transform(charpos.m_Origin);
if (anti_alias < FT_RENDER_MODE_LCD)
- glyph.m_Origin.x = FXSYS_roundf(glyph.m_fOrigin.x);
+ glyph.m_Origin.x = FXSYS_roundf(glyph.m_fDeviceOrigin.x);
else
- glyph.m_Origin.x = static_cast<int>(floor(glyph.m_fOrigin.x));
- glyph.m_Origin.y = FXSYS_roundf(glyph.m_fOrigin.y);
+ glyph.m_Origin.x = static_cast<int>(floor(glyph.m_fDeviceOrigin.x));
+ glyph.m_Origin.y = FXSYS_roundf(glyph.m_fDeviceOrigin.y);
if (charpos.m_bGlyphAdjust) {
CFX_Matrix new_matrix(
@@ -1021,7 +1022,7 @@
}
bool bBGRStripe = !!(text_flags & FXTEXT_BGR_STRIPE);
ncols /= 3;
- int x_subpixel = static_cast<int>(glyph.m_fOrigin.x * 3) % 3;
+ int x_subpixel = static_cast<int>(glyph.m_fDeviceOrigin.x * 3) % 3;
int start_col = std::max(point->x, 0);
FX_SAFE_INT32 end_col_safe = point->x;
end_col_safe += ncols;
diff --git a/core/fxge/text_glyph_pos.h b/core/fxge/text_glyph_pos.h
index b786432..be7ced2 100644
--- a/core/fxge/text_glyph_pos.h
+++ b/core/fxge/text_glyph_pos.h
@@ -24,7 +24,7 @@
UnownedPtr<const CFX_GlyphBitmap> m_pGlyph;
CFX_Point m_Origin;
- CFX_PointF m_fOrigin;
+ CFX_PointF m_fDeviceOrigin;
};
#endif // CORE_FXGE_TEXT_GLYPH_POS_H_
