Index: core/fxge/win32/fx_win32_dwrite.cpp |
diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp |
index b12e5d7d15fbea85c795c42f36f2086898840680..dc0f5ed7459f3fbac418e896186980e8b4b7e2e4 100644 |
--- a/core/fxge/win32/fx_win32_dwrite.cpp |
+++ b/core/fxge/win32/fx_win32_dwrite.cpp |
@@ -149,7 +149,7 @@ LPVOID CDWriteExt::DwCreateFontFaceFromStream(uint8_t* pData, |
IDWriteFactory* pDwFactory = (IDWriteFactory*)m_pDWriteFactory; |
IDWriteFontFile* pDwFontFile = nullptr; |
IDWriteFontFace* pDwFontFace = nullptr; |
- BOOL isSupportedFontType = FALSE; |
+ BOOL isSupportedFontType = false; |
DWRITE_FONT_FILE_TYPE fontFileType; |
DWRITE_FONT_FACE_TYPE fontFaceType; |
UINT32 numberOfFaces; |
@@ -180,10 +180,10 @@ failed: |
return nullptr; |
} |
-FX_BOOL CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap, |
- void** renderTarget) { |
+bool CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap, |
+ void** renderTarget) { |
if (pBitmap->GetFormat() > FXDIB_Argb) { |
- return FALSE; |
+ return false; |
} |
IDWriteFactory* pDwFactory = (IDWriteFactory*)m_pDWriteFactory; |
IDWriteGdiInterop* pGdiInterop = nullptr; |
@@ -214,29 +214,29 @@ FX_BOOL CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap, |
SafeRelease(&pGdiInterop); |
SafeRelease(&pBitmapRenderTarget); |
SafeRelease(&pRenderingParams); |
- return TRUE; |
+ return true; |
failed: |
SafeRelease(&pGdiInterop); |
SafeRelease(&pBitmapRenderTarget); |
SafeRelease(&pRenderingParams); |
- return FALSE; |
+ return false; |
} |
-FX_BOOL CDWriteExt::DwRendingString(void* renderTarget, |
- CFX_ClipRgn* pClipRgn, |
- FX_RECT& stringRect, |
- CFX_Matrix* pMatrix, |
- void* font, |
- FX_FLOAT font_size, |
- FX_ARGB text_color, |
- int glyph_count, |
- unsigned short* glyph_indices, |
- FX_FLOAT baselineOriginX, |
- FX_FLOAT baselineOriginY, |
- void* glyph_offsets, |
- FX_FLOAT* glyph_advances) { |
+bool CDWriteExt::DwRendingString(void* renderTarget, |
+ CFX_ClipRgn* pClipRgn, |
+ FX_RECT& stringRect, |
+ CFX_Matrix* pMatrix, |
+ void* font, |
+ FX_FLOAT font_size, |
+ FX_ARGB text_color, |
+ int glyph_count, |
+ unsigned short* glyph_indices, |
+ FX_FLOAT baselineOriginX, |
+ FX_FLOAT baselineOriginY, |
+ void* glyph_offsets, |
+ FX_FLOAT* glyph_advances) { |
if (!renderTarget) { |
- return TRUE; |
+ return true; |
} |
CDwGdiTextRenderer* pTextRenderer = (CDwGdiTextRenderer*)renderTarget; |
DWRITE_MATRIX transform; |
@@ -256,7 +256,7 @@ FX_BOOL CDWriteExt::DwRendingString(void* renderTarget, |
glyphRun.glyphIndices = glyph_indices; |
glyphRun.glyphAdvances = glyph_advances; |
glyphRun.glyphOffsets = (DWRITE_GLYPH_OFFSET*)glyph_offsets; |
- glyphRun.isSideways = FALSE; |
+ glyphRun.isSideways = false; |
glyphRun.bidiLevel = 0; |
hr = pTextRenderer->DrawGlyphRun( |
stringRect, pClipRgn, pMatrix ? &transform : nullptr, baselineOriginX, |