Index: core/src/fxge/agg/include/fx_agg_driver.h |
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h |
index 2954526cd57645b7e531471edcd4848220277f84..c3de76d3699d4f0731da7999981df0bdf106b09e 100644 |
--- a/core/src/fxge/agg/include/fx_agg_driver.h |
+++ b/core/src/fxge/agg/include/fx_agg_driver.h |
@@ -26,119 +26,110 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { |
FX_BOOL bRgbByteOrder, |
CFX_DIBitmap* pOriDevice, |
FX_BOOL bGroupKnockout); |
- virtual ~CFX_AggDeviceDriver(); |
+ ~CFX_AggDeviceDriver() override; |
+ |
void InitPlatform(); |
void DestroyPlatform(); |
- virtual int GetDeviceCaps(int caps_id); |
- |
- virtual void SaveState(); |
- virtual void RestoreState(FX_BOOL bKeepSaved); |
- |
- virtual FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, |
- const CFX_AffineMatrix* pObject2Device, |
- int fill_mode); |
- |
- virtual FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, |
- const CFX_AffineMatrix* pObject2Device, |
- const CFX_GraphStateData* pGraphState); |
- |
- virtual FX_BOOL DrawPath(const CFX_PathData* pPathData, |
+ // IFX_RenderDeviceDriver |
+ int GetDeviceCaps(int caps_id) override; |
+ void SaveState() override; |
+ void RestoreState(FX_BOOL bKeepSaved) override; |
+ FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, |
const CFX_AffineMatrix* pObject2Device, |
- const CFX_GraphStateData* pGraphState, |
- FX_DWORD fill_color, |
- FX_DWORD stroke_color, |
- int fill_mode, |
- int alpha_flag, |
- void* pIccTransform, |
- int blend_type); |
- |
- virtual FX_BOOL SetPixel(int x, |
- int y, |
+ int fill_mode) override; |
+ FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, |
+ const CFX_AffineMatrix* pObject2Device, |
+ const CFX_GraphStateData* pGraphState) override; |
+ FX_BOOL DrawPath(const CFX_PathData* pPathData, |
+ const CFX_AffineMatrix* pObject2Device, |
+ const CFX_GraphStateData* pGraphState, |
+ FX_DWORD fill_color, |
+ FX_DWORD stroke_color, |
+ int fill_mode, |
+ int alpha_flag, |
+ void* pIccTransform, |
+ int blend_type) override; |
+ FX_BOOL SetPixel(int x, |
+ int y, |
+ FX_DWORD color, |
+ int alpha_flag, |
+ void* pIccTransform) override; |
+ FX_BOOL FillRect(const FX_RECT* pRect, |
+ FX_DWORD fill_color, |
+ int alpha_flag, |
+ void* pIccTransform, |
+ int blend_type) override; |
+ FX_BOOL DrawCosmeticLine(FX_FLOAT x1, |
+ FX_FLOAT y1, |
+ FX_FLOAT x2, |
+ FX_FLOAT y2, |
FX_DWORD color, |
int alpha_flag, |
- void* pIccTransform); |
- |
- virtual FX_BOOL FillRect(const FX_RECT* pRect, |
- FX_DWORD fill_color, |
- int alpha_flag, |
void* pIccTransform, |
- int blend_type); |
- |
- virtual FX_BOOL DrawCosmeticLine(FX_FLOAT x1, |
- FX_FLOAT y1, |
- FX_FLOAT x2, |
- FX_FLOAT y2, |
- FX_DWORD color, |
- int alpha_flag, |
- void* pIccTransform, |
- int blend_type) { |
+ int blend_type) override { |
return FALSE; |
} |
- |
- virtual FX_BOOL GetClipBox(FX_RECT* pRect); |
- |
- virtual FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, |
- int left, |
- int top, |
- void* pIccTransform = NULL, |
- FX_BOOL bDEdge = FALSE); |
- virtual CFX_DIBitmap* GetBackDrop() { return m_pOriDevice; } |
- |
- virtual FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, |
- FX_DWORD color, |
- const FX_RECT* pSrcRect, |
- int left, |
- int top, |
- int blend_type, |
- int alpha_flag, |
- void* pIccTransform); |
- virtual FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, |
- FX_DWORD color, |
- int dest_left, |
- int dest_top, |
- int dest_width, |
- int dest_height, |
- const FX_RECT* pClipRect, |
- FX_DWORD flags, |
- int alpha_flag, |
- void* pIccTransform, |
- int blend_type); |
- |
- virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, |
- int bitmap_alpha, |
- FX_DWORD color, |
- const CFX_AffineMatrix* pMatrix, |
- FX_DWORD flags, |
- void*& handle, |
- int alpha_flag, |
- void* pIccTransform, |
- int blend_type); |
- virtual FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause); |
- virtual void CancelDIBits(void* handle); |
- |
- virtual FX_BOOL DrawDeviceText(int nChars, |
- const FXTEXT_CHARPOS* pCharPos, |
- CFX_Font* pFont, |
- CFX_FontCache* pCache, |
- const CFX_AffineMatrix* pObject2Device, |
- FX_FLOAT font_size, |
- FX_DWORD color, |
- int alpha_flag, |
- void* pIccTransform); |
- virtual FX_BOOL RenderRasterizer( |
- FX_NAMESPACE_DECLARE(agg, rasterizer_scanline_aa) & rasterizer, |
- FX_DWORD color, |
- FX_BOOL bFullCover, |
- FX_BOOL bGroupKnockout, |
- int alpha_flag, |
- void* pIccTransform); |
+ FX_BOOL GetClipBox(FX_RECT* pRect) override; |
+ FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, |
+ int left, |
+ int top, |
+ void* pIccTransform = NULL, |
+ FX_BOOL bDEdge = FALSE) override; |
+ CFX_DIBitmap* GetBackDrop() override { return m_pOriDevice; } |
+ FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, |
+ FX_DWORD color, |
+ const FX_RECT* pSrcRect, |
+ int left, |
+ int top, |
+ int blend_type, |
+ int alpha_flag, |
+ void* pIccTransform) override; |
+ FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, |
+ FX_DWORD color, |
+ int dest_left, |
+ int dest_top, |
+ int dest_width, |
+ int dest_height, |
+ const FX_RECT* pClipRect, |
+ FX_DWORD flags, |
+ int alpha_flag, |
+ void* pIccTransform, |
+ int blend_type) override; |
+ FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, |
+ int bitmap_alpha, |
+ FX_DWORD color, |
+ const CFX_AffineMatrix* pMatrix, |
+ FX_DWORD flags, |
+ void*& handle, |
+ int alpha_flag, |
+ void* pIccTransform, |
+ int blend_type) override; |
+ FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override; |
+ void CancelDIBits(void* handle) override; |
+ FX_BOOL DrawDeviceText(int nChars, |
+ const FXTEXT_CHARPOS* pCharPos, |
+ CFX_Font* pFont, |
+ CFX_FontCache* pCache, |
+ const CFX_AffineMatrix* pObject2Device, |
+ FX_FLOAT font_size, |
+ FX_DWORD color, |
+ int alpha_flag, |
+ void* pIccTransform) override; |
+ int GetDriverType() override { return 1; } |
+ |
+ FX_BOOL RenderRasterizer(FX_NAMESPACE_DECLARE(agg, rasterizer_scanline_aa) & |
+ rasterizer, |
+ FX_DWORD color, |
+ FX_BOOL bFullCover, |
+ FX_BOOL bGroupKnockout, |
+ int alpha_flag, |
+ void* pIccTransform); |
void SetClipMask(FX_NAMESPACE_DECLARE(agg, rasterizer_scanline_aa) & |
rasterizer); |
virtual uint8_t* GetBuffer() const { return m_pBitmap->GetBuffer(); } |
- virtual int GetDriverType() { return 1; } |
CFX_DIBitmap* m_pBitmap; |
CFX_ClipRgn* m_pClipRgn; |