Index: core/fxge/apple/apple_int.h |
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h |
index b85d4a784a9d1d633d84a64650c49aa2eefdc600..9881e17a8813b756276cd246d472fff48151858a 100644 |
--- a/core/fxge/apple/apple_int.h |
+++ b/core/fxge/apple/apple_int.h |
@@ -29,14 +29,14 @@ class CQuartz2D { |
void* CreateFont(const uint8_t* pFontData, uint32_t dwFontSize); |
void DestroyFont(void* pFont); |
void setGraphicsTextMatrix(void* graphics, CFX_Matrix* matrix); |
- FX_BOOL drawGraphicsString(void* graphics, |
- void* font, |
- FX_FLOAT fontSize, |
- uint16_t* glyphIndices, |
- CGPoint* glyphPositions, |
- int32_t chars, |
- FX_ARGB argb, |
- CFX_Matrix* matrix = nullptr); |
+ bool drawGraphicsString(void* graphics, |
+ void* font, |
+ FX_FLOAT fontSize, |
+ uint16_t* glyphIndices, |
+ CGPoint* glyphPositions, |
+ int32_t chars, |
+ FX_ARGB argb, |
+ CFX_Matrix* matrix = nullptr); |
void saveGraphicsState(void* graphics); |
void restoreGraphicsState(void* graphics); |
}; |
@@ -59,58 +59,58 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
CFX_Matrix GetCTM() const override; |
void SaveState() override; |
void RestoreState(bool bKeepSaved) override; |
- FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, |
- const CFX_Matrix* pObject2Device, |
- int fill_mode) override; |
- FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, |
- const CFX_Matrix* pObject2Device, |
- const CFX_GraphStateData* pGraphState) override; |
- FX_BOOL DrawPath(const CFX_PathData* pPathData, |
- const CFX_Matrix* pObject2Device, |
- const CFX_GraphStateData* pGraphState, |
- uint32_t fill_color, |
- uint32_t stroke_color, |
- int fill_mode, |
- int blend_type) override; |
- FX_BOOL FillRectWithBlend(const FX_RECT* pRect, |
- uint32_t fill_color, |
- int blend_type) override; |
- FX_BOOL DrawCosmeticLine(FX_FLOAT x1, |
- FX_FLOAT y1, |
- FX_FLOAT x2, |
- FX_FLOAT y2, |
- uint32_t color, |
- int blend_type) override; |
- FX_BOOL GetClipBox(FX_RECT* pRect) override; |
- FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override; |
- FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, |
- uint32_t color, |
- const FX_RECT* pSrcRect, |
- int dest_left, |
- int dest_top, |
- int blend_type) override; |
- FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, |
+ bool SetClip_PathFill(const CFX_PathData* pPathData, |
+ const CFX_Matrix* pObject2Device, |
+ int fill_mode) override; |
+ bool SetClip_PathStroke(const CFX_PathData* pPathData, |
+ const CFX_Matrix* pObject2Device, |
+ const CFX_GraphStateData* pGraphState) override; |
+ bool DrawPath(const CFX_PathData* pPathData, |
+ const CFX_Matrix* pObject2Device, |
+ const CFX_GraphStateData* pGraphState, |
+ uint32_t fill_color, |
+ uint32_t stroke_color, |
+ int fill_mode, |
+ int blend_type) override; |
+ 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, |
uint32_t color, |
- int dest_left, |
- int dest_top, |
- int dest_width, |
- int dest_height, |
- const FX_RECT* pClipRect, |
- uint32_t flags, |
int blend_type) override; |
- FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, |
- int bitmap_alpha, |
- uint32_t color, |
- const CFX_Matrix* pMatrix, |
- uint32_t flags, |
- void*& handle, |
- int blend_type) override; |
- FX_BOOL DrawDeviceText(int nChars, |
- const FXTEXT_CHARPOS* pCharPos, |
- CFX_Font* pFont, |
- const CFX_Matrix* pObject2Device, |
- FX_FLOAT font_size, |
- uint32_t color) override; |
+ bool GetClipBox(FX_RECT* pRect) override; |
+ bool GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override; |
+ bool SetDIBits(const CFX_DIBSource* pBitmap, |
+ uint32_t color, |
+ const FX_RECT* pSrcRect, |
+ int dest_left, |
+ int dest_top, |
+ int blend_type) override; |
+ bool StretchDIBits(const CFX_DIBSource* pBitmap, |
+ uint32_t color, |
+ int dest_left, |
+ int dest_top, |
+ int dest_width, |
+ int dest_height, |
+ const FX_RECT* pClipRect, |
+ uint32_t flags, |
+ int blend_type) override; |
+ bool StartDIBits(const CFX_DIBSource* pBitmap, |
+ int bitmap_alpha, |
+ uint32_t color, |
+ const CFX_Matrix* pMatrix, |
+ uint32_t flags, |
+ void*& handle, |
+ int blend_type) override; |
+ bool DrawDeviceText(int nChars, |
+ const FXTEXT_CHARPOS* pCharPos, |
+ CFX_Font* pFont, |
+ const CFX_Matrix* pObject2Device, |
+ FX_FLOAT font_size, |
+ uint32_t color) override; |
void ClearDriver() override; |
protected: |
@@ -121,13 +121,13 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
void setPathToContext(const CFX_PathData* pathData); |
FX_FLOAT getLineWidth(const CFX_GraphStateData* graphState, |
CGAffineTransform ctm); |
- FX_BOOL CG_DrawGlyphRun(int nChars, |
- const FXTEXT_CHARPOS* pCharPos, |
- CFX_Font* pFont, |
- const CFX_Matrix* pGlyphMatrix, |
- const CFX_Matrix* pObject2Device, |
- FX_FLOAT font_size, |
- uint32_t argb); |
+ bool CG_DrawGlyphRun(int nChars, |
+ const FXTEXT_CHARPOS* pCharPos, |
+ CFX_Font* pFont, |
+ const CFX_Matrix* pGlyphMatrix, |
+ const CFX_Matrix* pObject2Device, |
+ FX_FLOAT font_size, |
+ uint32_t argb); |
void CG_SetImageTransform(int dest_left, |
int dest_top, |
int dest_width, |