summaryrefslogtreecommitdiff
path: root/core/fxge/win32
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-03-14 14:43:42 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-03-14 19:05:58 +0000
commit05df075154a832fcb476e1dfcfb865722d0ea898 (patch)
treeb8b771b62adae74d5d5ee561db75d10de3a848bf /core/fxge/win32
parent6b94f01d1c8ad386d497428c7397b1a99614aeba (diff)
downloadpdfium-05df075154a832fcb476e1dfcfb865722d0ea898.tar.xz
Replace FX_FLOAT with underlying float type.
Change-Id: I158b7d80b0ec28b742a9f2d5a96f3dde7fb3ab56 Reviewed-on: https://pdfium-review.googlesource.com/3031 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fxge/win32')
-rw-r--r--core/fxge/win32/cfx_psrenderer.cpp17
-rw-r--r--core/fxge/win32/cfx_psrenderer.h2
-rw-r--r--core/fxge/win32/dwrite_int.h8
-rw-r--r--core/fxge/win32/fx_win32_device.cpp81
-rw-r--r--core/fxge/win32/fx_win32_dwrite.cpp8
-rw-r--r--core/fxge/win32/fx_win32_gdipext.cpp42
-rw-r--r--core/fxge/win32/fx_win32_print.cpp18
-rw-r--r--core/fxge/win32/win32_int.h32
8 files changed, 102 insertions, 106 deletions
diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp
index c3d2c66d9d..391af83630 100644
--- a/core/fxge/win32/cfx_psrenderer.cpp
+++ b/core/fxge/win32/cfx_psrenderer.cpp
@@ -22,7 +22,7 @@ struct PSGlyph {
CFX_Font* m_pFont;
uint32_t m_GlyphIndex;
bool m_bGlyphAdjust;
- FX_FLOAT m_AdjustMatrix[4];
+ float m_AdjustMatrix[4];
};
class CPSFont {
@@ -260,7 +260,7 @@ void CFX_PSRenderer::SetGraphState(const CFX_GraphStateData* pGraphState) {
if (!m_bGraphStateSet ||
m_CurGraphState.m_DashCount != pGraphState->m_DashCount ||
FXSYS_memcmp(m_CurGraphState.m_DashArray, pGraphState->m_DashArray,
- sizeof(FX_FLOAT) * m_CurGraphState.m_DashCount)) {
+ sizeof(float) * m_CurGraphState.m_DashCount)) {
buf << "[";
for (int i = 0; i < pGraphState->m_DashCount; ++i) {
buf << pGraphState->m_DashArray[i] << " ";
@@ -343,9 +343,9 @@ bool CFX_PSRenderer::SetDIBits(const CFX_DIBSource* pSource,
int left,
int top) {
StartRendering();
- CFX_Matrix matrix((FX_FLOAT)(pSource->GetWidth()), 0.0f, 0.0f,
- -(FX_FLOAT)(pSource->GetHeight()), (FX_FLOAT)(left),
- (FX_FLOAT)(top + pSource->GetHeight()));
+ CFX_Matrix matrix((float)(pSource->GetWidth()), 0.0f, 0.0f,
+ -(float)(pSource->GetHeight()), (float)(left),
+ (float)(top + pSource->GetHeight()));
return DrawDIBits(pSource, color, &matrix, 0);
}
@@ -357,9 +357,8 @@ bool CFX_PSRenderer::StretchDIBits(const CFX_DIBSource* pSource,
int dest_height,
uint32_t flags) {
StartRendering();
- CFX_Matrix matrix((FX_FLOAT)(dest_width), 0.0f, 0.0f,
- (FX_FLOAT)(-dest_height), (FX_FLOAT)(dest_left),
- (FX_FLOAT)(dest_top + dest_height));
+ CFX_Matrix matrix((float)(dest_width), 0.0f, 0.0f, (float)(-dest_height),
+ (float)(dest_left), (float)(dest_top + dest_height));
return DrawDIBits(pSource, color, &matrix, flags);
}
@@ -632,7 +631,7 @@ bool CFX_PSRenderer::DrawText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
+ float font_size,
uint32_t color) {
StartRendering();
int alpha = FXARGB_A(color);
diff --git a/core/fxge/win32/cfx_psrenderer.h b/core/fxge/win32/cfx_psrenderer.h
index 163c6180af..133d7b9d72 100644
--- a/core/fxge/win32/cfx_psrenderer.h
+++ b/core/fxge/win32/cfx_psrenderer.h
@@ -70,7 +70,7 @@ class CFX_PSRenderer {
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
+ float font_size,
uint32_t color);
private:
diff --git a/core/fxge/win32/dwrite_int.h b/core/fxge/win32/dwrite_int.h
index 86ead89947..105c34998c 100644
--- a/core/fxge/win32/dwrite_int.h
+++ b/core/fxge/win32/dwrite_int.h
@@ -46,14 +46,14 @@ class CDWriteExt {
FX_RECT& stringRect,
CFX_Matrix* pMatrix,
void* font,
- FX_FLOAT font_size,
+ float font_size,
FX_ARGB text_color,
int glyph_count,
unsigned short* glyph_indices,
- FX_FLOAT baselineOriginX,
- FX_FLOAT baselineOriginY,
+ float baselineOriginX,
+ float baselineOriginY,
void* glyph_offsets,
- FX_FLOAT* glyph_advances);
+ float* glyph_advances);
void DwDeleteFont(void* pFont);
protected:
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index d1d81b18e4..b2ee4549ea 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -91,8 +91,8 @@ bool IsGDIEnabled() {
HPEN CreatePen(const CFX_GraphStateData* pGraphState,
const CFX_Matrix* pMatrix,
uint32_t argb) {
- FX_FLOAT width;
- FX_FLOAT scale = 1.f;
+ float width;
+ float scale = 1.f;
if (pMatrix)
scale = FXSYS_fabs(pMatrix->a) > FXSYS_fabs(pMatrix->b)
? FXSYS_fabs(pMatrix->a)
@@ -215,26 +215,26 @@ void SetPathToDC(HDC hDC,
// altogether and replace by Skia code.
struct rect_base {
- FX_FLOAT x1;
- FX_FLOAT y1;
- FX_FLOAT x2;
- FX_FLOAT y2;
+ float x1;
+ float y1;
+ float x2;
+ float y2;
};
-unsigned clip_liang_barsky(FX_FLOAT x1,
- FX_FLOAT y1,
- FX_FLOAT x2,
- FX_FLOAT y2,
+unsigned clip_liang_barsky(float x1,
+ float y1,
+ float x2,
+ float y2,
const rect_base& clip_box,
- FX_FLOAT* x,
- FX_FLOAT* y) {
- const FX_FLOAT nearzero = 1e-30f;
- FX_FLOAT deltax = x2 - x1;
- FX_FLOAT deltay = y2 - y1;
+ float* x,
+ float* y) {
+ const float nearzero = 1e-30f;
+ float deltax = x2 - x1;
+ float deltay = y2 - y1;
unsigned np = 0;
if (deltax == 0)
deltax = (x1 > clip_box.x1) ? -nearzero : nearzero;
- FX_FLOAT xin, xout;
+ float xin, xout;
if (deltax > 0) {
xin = clip_box.x1;
xout = clip_box.x2;
@@ -242,10 +242,10 @@ unsigned clip_liang_barsky(FX_FLOAT x1,
xin = clip_box.x2;
xout = clip_box.x1;
}
- FX_FLOAT tinx = (xin - x1) / deltax;
+ float tinx = (xin - x1) / deltax;
if (deltay == 0)
deltay = (y1 > clip_box.y1) ? -nearzero : nearzero;
- FX_FLOAT yin, yout;
+ float yin, yout;
if (deltay > 0) {
yin = clip_box.y1;
yout = clip_box.y2;
@@ -253,8 +253,8 @@ unsigned clip_liang_barsky(FX_FLOAT x1,
yin = clip_box.y2;
yout = clip_box.y1;
}
- FX_FLOAT tiny = (yin - y1) / deltay;
- FX_FLOAT tin1, tin2;
+ float tiny = (yin - y1) / deltay;
+ float tin1, tin2;
if (tinx < tiny) {
tin1 = tinx;
tin2 = tiny;
@@ -269,9 +269,9 @@ unsigned clip_liang_barsky(FX_FLOAT x1,
++np;
}
if (tin2 <= 1.0f) {
- FX_FLOAT toutx = (xout - x1) / deltax;
- FX_FLOAT touty = (yout - y1) / deltay;
- FX_FLOAT tout1 = (toutx < touty) ? toutx : touty;
+ float toutx = (xout - x1) / deltax;
+ float touty = (yout - y1) / deltay;
+ float tout1 = (toutx < touty) ? toutx : touty;
if (tin2 > 0 || tout1 > 0) {
if (tin2 <= tout1) {
if (tin2 > 0) {
@@ -928,10 +928,7 @@ void* CGdiDeviceDriver::GetPlatformSurface() const {
return (void*)m_hDC;
}
-void CGdiDeviceDriver::DrawLine(FX_FLOAT x1,
- FX_FLOAT y1,
- FX_FLOAT x2,
- FX_FLOAT y2) {
+void CGdiDeviceDriver::DrawLine(float x1, float y1, float x2, float y2) {
if (!m_bMetafileDCType) { // EMF drawing is not bound to the DC.
int startOutOfBoundsFlag = (x1 < 0) | ((x1 > m_Width) << 1) |
((y1 < 0) << 2) | ((y1 > m_Height) << 3);
@@ -941,18 +938,18 @@ void CGdiDeviceDriver::DrawLine(FX_FLOAT x1,
return;
if (startOutOfBoundsFlag || endOutOfBoundsFlag) {
- FX_FLOAT x[2];
- FX_FLOAT y[2];
+ float x[2];
+ float y[2];
int np;
#ifdef _SKIA_SUPPORT_
// TODO(caryclark) temporary replacement of antigrain in line function
// to permit removing antigrain altogether
- rect_base rect = {0.0f, 0.0f, (FX_FLOAT)(m_Width), (FX_FLOAT)(m_Height)};
+ rect_base rect = {0.0f, 0.0f, (float)(m_Width), (float)(m_Height)};
np = clip_liang_barsky(x1, y1, x2, y2, rect, x, y);
#else
- agg::rect_base<FX_FLOAT> rect(0.0f, 0.0f, (FX_FLOAT)(m_Width),
- (FX_FLOAT)(m_Height));
- np = agg::clip_liang_barsky<FX_FLOAT>(x1, y1, x2, y2, rect, x, y);
+ agg::rect_base<float> rect(0.0f, 0.0f, (float)(m_Width),
+ (float)(m_Height));
+ np = agg::clip_liang_barsky<float>(x1, y1, x2, y2, rect, x, y);
#endif
if (np == 0)
return;
@@ -994,13 +991,13 @@ bool CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData,
FX_RECT bbox = bbox_f.GetInnerRect();
if (bbox.Width() <= 0) {
- return DrawCosmeticLine(
- (FX_FLOAT)(bbox.left), (FX_FLOAT)(bbox.top), (FX_FLOAT)(bbox.left),
- (FX_FLOAT)(bbox.bottom + 1), fill_color, FXDIB_BLEND_NORMAL);
+ return DrawCosmeticLine((float)(bbox.left), (float)(bbox.top),
+ (float)(bbox.left), (float)(bbox.bottom + 1),
+ fill_color, FXDIB_BLEND_NORMAL);
}
if (bbox.Height() <= 0) {
- return DrawCosmeticLine((FX_FLOAT)(bbox.left), (FX_FLOAT)(bbox.top),
- (FX_FLOAT)(bbox.right + 1), (FX_FLOAT)(bbox.top),
+ return DrawCosmeticLine((float)(bbox.left), (float)(bbox.top),
+ (float)(bbox.right + 1), (float)(bbox.top),
fill_color, FXDIB_BLEND_NORMAL);
}
}
@@ -1133,10 +1130,10 @@ bool CGdiDeviceDriver::SetClip_PathStroke(
return ret;
}
-bool CGdiDeviceDriver::DrawCosmeticLine(FX_FLOAT x1,
- FX_FLOAT y1,
- FX_FLOAT x2,
- FX_FLOAT y2,
+bool CGdiDeviceDriver::DrawCosmeticLine(float x1,
+ float y1,
+ float x2,
+ float y2,
uint32_t color,
int blend_type) {
if (blend_type != FXDIB_BLEND_NORMAL)
diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp
index dc0f5ed745..e088e832bc 100644
--- a/core/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/fxge/win32/fx_win32_dwrite.cpp
@@ -227,14 +227,14 @@ bool CDWriteExt::DwRendingString(void* renderTarget,
FX_RECT& stringRect,
CFX_Matrix* pMatrix,
void* font,
- FX_FLOAT font_size,
+ float font_size,
FX_ARGB text_color,
int glyph_count,
unsigned short* glyph_indices,
- FX_FLOAT baselineOriginX,
- FX_FLOAT baselineOriginY,
+ float baselineOriginX,
+ float baselineOriginY,
void* glyph_offsets,
- FX_FLOAT* glyph_advances) {
+ float* glyph_advances) {
if (!renderTarget) {
return true;
}
diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp
index 1e51bba2b3..8a7f55e0cb 100644
--- a/core/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -779,7 +779,7 @@ bool CGdiplusExt::GdipCreateFontFamilyFromName(const wchar_t* name,
return false;
}
bool CGdiplusExt::GdipCreateFontFromFamily(void* pFamily,
- FX_FLOAT font_size,
+ float font_size,
int fontstyle,
int flag,
void** pFont) {
@@ -793,13 +793,13 @@ bool CGdiplusExt::GdipCreateFontFromFamily(void* pFamily,
}
return false;
}
-void CGdiplusExt::GdipGetFontSize(void* pFont, FX_FLOAT* size) {
+void CGdiplusExt::GdipGetFontSize(void* pFont, float* size) {
REAL get_size;
CGdiplusExt& GdiplusExt =
((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
GpStatus status = CallFunc(GdipGetFontSize)((GpFont*)pFont, (REAL*)&get_size);
if (status == Ok) {
- *size = (FX_FLOAT)get_size;
+ *size = (float)get_size;
} else {
*size = 0;
}
@@ -845,7 +845,7 @@ void CGdiplusExt::GdipDeleteBrush(void* pBrush) {
CallFunc(GdipDeleteBrush)((GpSolidFill*)pBrush);
}
void* CGdiplusExt::GdipCreateFontFromCollection(void* pFontCollection,
- FX_FLOAT font_size,
+ float font_size,
int fontstyle) {
CGdiplusExt& GdiplusExt =
((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
@@ -869,12 +869,12 @@ void* CGdiplusExt::GdipCreateFontFromCollection(void* pFontCollection,
}
return pFont;
}
-void CGdiplusExt::GdipCreateMatrix(FX_FLOAT a,
- FX_FLOAT b,
- FX_FLOAT c,
- FX_FLOAT d,
- FX_FLOAT e,
- FX_FLOAT f,
+void CGdiplusExt::GdipCreateMatrix(float a,
+ float b,
+ float c,
+ float d,
+ float e,
+ float f,
void** matrix) {
CGdiplusExt& GdiplusExt =
((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
@@ -972,11 +972,11 @@ static GpPen* _GdipCreatePen(const CFX_GraphStateData* pGraphState,
bool bTextMode = false) {
CGdiplusExt& GdiplusExt =
((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
- FX_FLOAT width = pGraphState ? pGraphState->m_LineWidth : 1.0f;
+ float width = pGraphState ? pGraphState->m_LineWidth : 1.0f;
if (!bTextMode) {
- FX_FLOAT unit =
- pMatrix ? 1.0f / ((pMatrix->GetXUnit() + pMatrix->GetYUnit()) / 2)
- : 1.0f;
+ float unit = pMatrix
+ ? 1.0f / ((pMatrix->GetXUnit() + pMatrix->GetYUnit()) / 2)
+ : 1.0f;
if (width < unit) {
width = unit;
}
@@ -1015,13 +1015,13 @@ static GpPen* _GdipCreatePen(const CFX_GraphStateData* pGraphState,
}
CallFunc(GdipSetPenLineJoin)(pPen, lineJoin);
if (pGraphState->m_DashCount) {
- FX_FLOAT* pDashArray = FX_Alloc(
- FX_FLOAT, pGraphState->m_DashCount + pGraphState->m_DashCount % 2);
+ float* pDashArray = FX_Alloc(
+ float, pGraphState->m_DashCount + pGraphState->m_DashCount % 2);
int nCount = 0;
- FX_FLOAT on_leftover = 0, off_leftover = 0;
+ float on_leftover = 0, off_leftover = 0;
for (int i = 0; i < pGraphState->m_DashCount; i += 2) {
- FX_FLOAT on_phase = pGraphState->m_DashArray[i];
- FX_FLOAT off_phase;
+ float on_phase = pGraphState->m_DashArray[i];
+ float off_phase;
if (i == pGraphState->m_DashCount - 1) {
off_phase = on_phase;
} else {
@@ -1057,7 +1057,7 @@ static GpPen* _GdipCreatePen(const CFX_GraphStateData* pGraphState,
}
}
CallFunc(GdipSetPenDashArray)(pPen, pDashArray, nCount);
- FX_FLOAT phase = pGraphState->m_DashPhase;
+ float phase = pGraphState->m_DashPhase;
if (bDashExtend) {
if (phase < 0.5f) {
phase = 0;
@@ -1089,7 +1089,7 @@ static bool IsSmallTriangle(PointF* points,
}
CFX_PointF diff = p1 - p2;
- FX_FLOAT distance_square = (diff.x * diff.x) + (diff.y * diff.y);
+ float distance_square = (diff.x * diff.x) + (diff.y * diff.y);
if (distance_square < (1.0f * 2 + 1.0f / 4)) {
v1 = i;
v2 = pair1;
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index cda83ebc95..061896f09b 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -199,7 +199,7 @@ bool CGdiPrinterDriver::DrawDeviceText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
+ float font_size,
uint32_t color) {
#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
if (!g_pdfium_print_text_with_gdi)
@@ -287,7 +287,7 @@ bool CGdiPrinterDriver::DrawDeviceText(int nChars,
// Text
CFX_WideString wsText;
std::vector<INT> spacing(nChars);
- FX_FLOAT fPreviousOriginX = 0;
+ float fPreviousOriginX = 0;
for (int i = 0; i < nChars; ++i) {
// Only works with PDFs from Skia's PDF generator. Cannot handle arbitrary
// values from PDFs.
@@ -300,8 +300,8 @@ bool CGdiPrinterDriver::DrawDeviceText(int nChars,
// Round the spacing to the nearest integer, but keep track of the rounding
// error for calculating the next spacing value.
- FX_FLOAT fOriginX = charpos.m_Origin.x * kScaleFactor;
- FX_FLOAT fPixelSpacing = fOriginX - fPreviousOriginX;
+ float fOriginX = charpos.m_Origin.x * kScaleFactor;
+ float fPixelSpacing = fOriginX - fPreviousOriginX;
spacing[i] = FXSYS_round(fPixelSpacing);
fPreviousOriginX = fOriginX - (fPixelSpacing - spacing[i]);
@@ -349,10 +349,10 @@ CPSPrinterDriver::CPSPrinterDriver(HDC hDC, int pslevel, bool bCmykOutput)
for (uint32_t i = 0; i < pData->rdh.nCount; i++) {
RECT* pRect =
reinterpret_cast<RECT*>(pData->Buffer + pData->rdh.nRgnSize * i);
- path.AppendRect(static_cast<FX_FLOAT>(pRect->left),
- static_cast<FX_FLOAT>(pRect->bottom),
- static_cast<FX_FLOAT>(pRect->right),
- static_cast<FX_FLOAT>(pRect->top));
+ path.AppendRect(static_cast<float>(pRect->left),
+ static_cast<float>(pRect->bottom),
+ static_cast<float>(pRect->right),
+ static_cast<float>(pRect->top));
}
m_PSRenderer.SetClip_PathFill(&path, nullptr, FXFILL_WINDING);
}
@@ -483,7 +483,7 @@ bool CPSPrinterDriver::DrawDeviceText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
+ float font_size,
uint32_t color) {
return m_PSRenderer.DrawText(nChars, pCharPos, pFont, pObject2Device,
font_size, color);
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 08a8224db6..54ea3716e1 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -75,12 +75,12 @@ class CGdiplusExt {
const void* matrix);
void GdipCreateBrush(uint32_t fill_argb, void** pBrush);
void GdipDeleteBrush(void* pBrush);
- void GdipCreateMatrix(FX_FLOAT a,
- FX_FLOAT b,
- FX_FLOAT c,
- FX_FLOAT d,
- FX_FLOAT e,
- FX_FLOAT f,
+ void GdipCreateMatrix(float a,
+ float b,
+ float c,
+ float d,
+ float e,
+ float f,
void** matrix);
void GdipDeleteMatrix(void* matrix);
bool GdipCreateFontFamilyFromName(const wchar_t* name,
@@ -88,17 +88,17 @@ class CGdiplusExt {
void** pFamily);
void GdipDeleteFontFamily(void* pFamily);
bool GdipCreateFontFromFamily(void* pFamily,
- FX_FLOAT font_size,
+ float font_size,
int fontstyle,
int flag,
void** pFont);
void* GdipCreateFontFromCollection(void* pFontCollection,
- FX_FLOAT font_size,
+ float font_size,
int fontstyle);
void GdipDeleteFont(void* pFont);
bool GdipCreateBitmap(CFX_DIBitmap* pBitmap, void** bitmap);
void GdipDisposeImage(void* bitmap);
- void GdipGetFontSize(void* pFont, FX_FLOAT* size);
+ void GdipGetFontSize(void* pFont, float* size);
void* GdiAddFontMemResourceEx(void* pFontdata,
uint32_t size,
void* pdv,
@@ -147,16 +147,16 @@ class CGdiDeviceDriver : public IFX_RenderDeviceDriver {
bool FillRectWithBlend(const FX_RECT* pRect,
uint32_t fill_color,
int blend_type) override;
- bool DrawCosmeticLine(FX_FLOAT x1,
- FX_FLOAT y1,
- FX_FLOAT x2,
- FX_FLOAT y2,
+ bool DrawCosmeticLine(float x1,
+ float y1,
+ float x2,
+ float y2,
uint32_t color,
int blend_type) override;
bool GetClipBox(FX_RECT* pRect) override;
void* GetPlatformSurface() const override;
- void DrawLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2);
+ void DrawLine(float x1, float y1, float x2, float y2);
bool GDI_SetDIBits(CFX_DIBitmap* pBitmap,
const FX_RECT* pSrcRect,
@@ -257,7 +257,7 @@ class CGdiPrinterDriver : public CGdiDeviceDriver {
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
+ float font_size,
uint32_t color) override;
const int m_HorzSize;
@@ -316,7 +316,7 @@ class CPSPrinterDriver : public IFX_RenderDeviceDriver {
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
+ float font_size,
uint32_t color) override;
void* GetPlatformSurface() const override;