| Index: core/fxge/agg/fx_agg_driver.h
|
| diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
|
| index 0789d022f312565381b8c7f3618e7ea68f3bc487..8da63394a4654ddadd744abbb03ca3e4cc8613e3 100644
|
| --- a/core/fxge/agg/fx_agg_driver.h
|
| +++ b/core/fxge/agg/fx_agg_driver.h
|
| @@ -33,9 +33,9 @@ class CAgg_PathData {
|
| class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| public:
|
| CFX_AggDeviceDriver(CFX_DIBitmap* pBitmap,
|
| - FX_BOOL bRgbByteOrder,
|
| + bool bRgbByteOrder,
|
| CFX_DIBitmap* pOriDevice,
|
| - FX_BOOL bGroupKnockout);
|
| + bool bGroupKnockout);
|
| ~CFX_AggDeviceDriver() override;
|
|
|
| void InitPlatform();
|
| @@ -45,64 +45,64 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| int GetDeviceCaps(int caps_id) 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 SetPixel(int x, int y, uint32_t color) override;
|
| - FX_BOOL FillRectWithBlend(const FX_RECT* pRect,
|
| - uint32_t fill_color,
|
| - int blend_type) override;
|
| - FX_BOOL GetClipBox(FX_RECT* pRect) override;
|
| - FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override;
|
| + 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 SetPixel(int x, int y, uint32_t color) override;
|
| + bool FillRectWithBlend(const FX_RECT* pRect,
|
| + uint32_t fill_color,
|
| + int blend_type) override;
|
| + bool GetClipBox(FX_RECT* pRect) override;
|
| + bool GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override;
|
| CFX_DIBitmap* GetBackDrop() override;
|
| - FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
|
| - uint32_t color,
|
| - const FX_RECT* pSrcRect,
|
| - int left,
|
| - int top,
|
| - int blend_type) override;
|
| - FX_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;
|
| - 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 ContinueDIBits(void* handle, IFX_Pause* pPause) override;
|
| + bool SetDIBits(const CFX_DIBSource* pBitmap,
|
| + uint32_t color,
|
| + const FX_RECT* pSrcRect,
|
| + int left,
|
| + int 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 ContinueDIBits(void* handle, IFX_Pause* pPause) override;
|
| void CancelDIBits(void* handle) 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 DrawDeviceText(int nChars,
|
| + const FXTEXT_CHARPOS* pCharPos,
|
| + CFX_Font* pFont,
|
| + const CFX_Matrix* pObject2Device,
|
| + FX_FLOAT font_size,
|
| + uint32_t color) override;
|
| int GetDriverType() const override;
|
|
|
| - FX_BOOL RenderRasterizer(agg::rasterizer_scanline_aa& rasterizer,
|
| - uint32_t color,
|
| - FX_BOOL bFullCover,
|
| - FX_BOOL bGroupKnockout,
|
| - int alpha_flag,
|
| - void* pIccTransform);
|
| + bool RenderRasterizer(agg::rasterizer_scanline_aa& rasterizer,
|
| + uint32_t color,
|
| + bool bFullCover,
|
| + bool bGroupKnockout,
|
| + int alpha_flag,
|
| + void* pIccTransform);
|
|
|
| void SetClipMask(agg::rasterizer_scanline_aa& rasterizer);
|
|
|
| @@ -116,9 +116,9 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| void* m_pPlatformGraphics;
|
| #endif
|
| int m_FillFlags;
|
| - FX_BOOL m_bRgbByteOrder;
|
| + bool m_bRgbByteOrder;
|
| CFX_DIBitmap* m_pOriDevice;
|
| - FX_BOOL m_bGroupKnockout;
|
| + bool m_bGroupKnockout;
|
| };
|
|
|
| #endif // CORE_FXGE_AGG_FX_AGG_DRIVER_H_
|
|
|