summaryrefslogtreecommitdiff
path: root/core/fxge/ge
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/ge')
-rw-r--r--core/fxge/ge/cfx_renderdevice.cpp52
-rw-r--r--core/fxge/ge/fx_ge_text.cpp10
2 files changed, 21 insertions, 41 deletions
diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp
index 40a7b53a16..12a3dd480d 100644
--- a/core/fxge/ge/cfx_renderdevice.cpp
+++ b/core/fxge/ge/cfx_renderdevice.cpp
@@ -27,19 +27,19 @@ namespace {
void AdjustGlyphSpace(std::vector<FXTEXT_GLYPHPOS>* pGlyphAndPos) {
ASSERT(pGlyphAndPos->size() > 1);
std::vector<FXTEXT_GLYPHPOS>& glyphs = *pGlyphAndPos;
- bool bVertical = glyphs.back().m_Origin.x == glyphs.front().m_Origin.x;
- if (!bVertical && (glyphs.back().m_Origin.y != glyphs.front().m_Origin.y))
+ bool bVertical = glyphs.back().m_OriginX == glyphs.front().m_OriginX;
+ if (!bVertical && (glyphs.back().m_OriginY != glyphs.front().m_OriginY))
return;
for (size_t i = glyphs.size() - 1; i > 1; --i) {
FXTEXT_GLYPHPOS& next = glyphs[i];
- int next_origin = bVertical ? next.m_Origin.y : next.m_Origin.x;
- FX_FLOAT next_origin_f = bVertical ? next.m_fOrigin.y : next.m_fOrigin.x;
+ int next_origin = bVertical ? next.m_OriginY : next.m_OriginX;
+ FX_FLOAT next_origin_f = bVertical ? next.m_fOriginY : next.m_fOriginX;
FXTEXT_GLYPHPOS& current = glyphs[i - 1];
- int& current_origin = bVertical ? current.m_Origin.y : current.m_Origin.x;
+ int& current_origin = bVertical ? current.m_OriginY : current.m_OriginX;
FX_FLOAT current_origin_f =
- bVertical ? current.m_fOrigin.y : current.m_fOrigin.x;
+ bVertical ? current.m_fOriginY : current.m_fOriginX;
int space = next_origin - current_origin;
FX_FLOAT space_f = next_origin_f - current_origin_f;
@@ -346,21 +346,6 @@ bool ShouldDrawDeviceText(const CFX_Font* pFont, uint32_t text_flags) {
} // namespace
-FXTEXT_CHARPOS::FXTEXT_CHARPOS()
- : m_GlyphIndex(0),
- m_FontCharWidth(0),
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
- m_ExtGID(0),
-#endif
- m_FallbackFontPosition(0),
- m_bGlyphAdjust(false),
- m_bFontStyle(false) {
-}
-
-FXTEXT_CHARPOS::FXTEXT_CHARPOS(const FXTEXT_CHARPOS&) = default;
-
-FXTEXT_CHARPOS::~FXTEXT_CHARPOS(){};
-
CFX_RenderDevice::CFX_RenderDevice()
: m_pBitmap(nullptr),
m_Width(0),
@@ -923,13 +908,14 @@ bool CFX_RenderDevice::DrawNormalText(int nChars,
for (size_t i = 0; i < glyphs.size(); ++i) {
FXTEXT_GLYPHPOS& glyph = glyphs[i];
const FXTEXT_CHARPOS& charpos = pCharPos[i];
-
- glyph.m_fOrigin = text2Device.Transform(charpos.m_Origin);
+ glyph.m_fOriginX = charpos.m_OriginX;
+ glyph.m_fOriginY = charpos.m_OriginY;
+ text2Device.TransformPoint(glyph.m_fOriginX, glyph.m_fOriginY);
if (anti_alias < FXFT_RENDER_MODE_LCD)
- glyph.m_Origin.x = FXSYS_round(glyph.m_fOrigin.x);
+ glyph.m_OriginX = FXSYS_round(glyph.m_fOriginX);
else
- glyph.m_Origin.x = static_cast<int>(FXSYS_floor(glyph.m_fOrigin.x));
- glyph.m_Origin.y = FXSYS_round(glyph.m_fOrigin.y);
+ glyph.m_OriginX = (int)FXSYS_floor(glyph.m_fOriginX);
+ glyph.m_OriginY = FXSYS_round(glyph.m_fOriginY);
if (charpos.m_bGlyphAdjust) {
CFX_Matrix new_matrix(
charpos.m_AdjustMatrix[0], charpos.m_AdjustMatrix[1],
@@ -975,8 +961,8 @@ bool CFX_RenderDevice::DrawNormalText(int nChars,
continue;
const CFX_DIBitmap* pGlyph = &glyph.m_pGlyph->m_Bitmap;
bitmap.TransferBitmap(
- glyph.m_Origin.x + glyph.m_pGlyph->m_Left - pixel_left,
- glyph.m_Origin.y - glyph.m_pGlyph->m_Top - pixel_top,
+ glyph.m_OriginX + glyph.m_pGlyph->m_Left - pixel_left,
+ glyph.m_OriginY - glyph.m_pGlyph->m_Top - pixel_top,
pGlyph->GetWidth(), pGlyph->GetHeight(), pGlyph, 0, 0);
}
return SetBitMask(&bitmap, bmp_rect.left, bmp_rect.top, fill_color);
@@ -1010,13 +996,13 @@ bool CFX_RenderDevice::DrawNormalText(int nChars,
if (!glyph.m_pGlyph)
continue;
- pdfium::base::CheckedNumeric<int> left = glyph.m_Origin.x;
+ pdfium::base::CheckedNumeric<int> left = glyph.m_OriginX;
left += glyph.m_pGlyph->m_Left;
left -= pixel_left;
if (!left.IsValid())
return false;
- pdfium::base::CheckedNumeric<int> top = glyph.m_Origin.y;
+ pdfium::base::CheckedNumeric<int> top = glyph.m_OriginY;
top -= glyph.m_pGlyph->m_Top;
top -= pixel_top;
if (!top.IsValid())
@@ -1036,7 +1022,7 @@ bool CFX_RenderDevice::DrawNormalText(int nChars,
}
bool bBGRStripe = !!(text_flags & FXTEXT_BGR_STRIPE);
ncols /= 3;
- int x_subpixel = static_cast<int>(glyph.m_fOrigin.x * 3) % 3;
+ int x_subpixel = (int)(glyph.m_fOriginX * 3) % 3;
int start_col =
pdfium::base::ValueOrDieForType<int>(pdfium::base::CheckMax(left, 0));
pdfium::base::CheckedNumeric<int> end_col_safe = left;
@@ -1079,8 +1065,8 @@ bool CFX_RenderDevice::DrawTextPath(int nChars,
charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3],
0, 0);
}
- matrix.Concat(CFX_Matrix(font_size, 0, 0, font_size, charpos.m_Origin.x,
- charpos.m_Origin.y));
+ matrix.Concat(CFX_Matrix(font_size, 0, 0, font_size, charpos.m_OriginX,
+ charpos.m_OriginY));
const CFX_PathData* pPath =
pFont->LoadGlyphPath(charpos.m_GlyphIndex, charpos.m_FontCharWidth);
if (!pPath)
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 669969db0b..cc7ef7c6d7 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -28,12 +28,6 @@ void ResetTransform(FT_Face face) {
} // namespace
-FXTEXT_GLYPHPOS::FXTEXT_GLYPHPOS() : m_pGlyph(nullptr) {}
-
-FXTEXT_GLYPHPOS::FXTEXT_GLYPHPOS(const FXTEXT_GLYPHPOS&) = default;
-
-FXTEXT_GLYPHPOS::~FXTEXT_GLYPHPOS(){};
-
ScopedFontTransform::ScopedFontTransform(FT_Face face, FXFT_Matrix* matrix)
: m_Face(face) {
FXFT_Set_Transform(m_Face, matrix, 0);
@@ -54,7 +48,7 @@ FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs,
if (!pGlyph)
continue;
- FX_SAFE_INT32 char_left = glyph.m_Origin.x;
+ FX_SAFE_INT32 char_left = glyph.m_OriginX;
char_left += pGlyph->m_Left;
if (!char_left.IsValid())
continue;
@@ -70,7 +64,7 @@ FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs,
if (!char_right.IsValid())
continue;
- FX_SAFE_INT32 char_top = glyph.m_Origin.y;
+ FX_SAFE_INT32 char_top = glyph.m_OriginY;
char_top -= pGlyph->m_Top;
if (!char_top.IsValid())
continue;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 11:48:14 +0000