| Index: core/src/fxge/skia/fx_skia_device.h
|
| diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/src/fxge/skia/fx_skia_device.h
|
| index 7ae019c1245949ee6afde5d96e853b9a6078044f..582b844fb9b6ac0c106fae7c0aab69ed5375a63d 100644
|
| --- a/core/src/fxge/skia/fx_skia_device.h
|
| +++ b/core/src/fxge/skia/fx_skia_device.h
|
| @@ -67,10 +67,10 @@ public:
|
| int alpha_flag = 0, void* pIccTransform = NULL);
|
|
|
| virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color,
|
| - const CFX_AffineMatrix* pMatrix, FX_DWORD flags, FX_LPVOID& handle,
|
| + const CFX_AffineMatrix* pMatrix, FX_DWORD flags, void*& handle,
|
| int alpha_flag = 0, void* pIccTransform = NULL);
|
| - virtual FX_BOOL ContinueDIBits(FX_LPVOID handle, IFX_Pause* pPause);
|
| - virtual void CancelDIBits(FX_LPVOID handle);
|
| + 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_FIXFLOAT font_size, FX_DWORD color,
|
| @@ -82,7 +82,7 @@ public:
|
| int alpha_flag, void* pIccTransform, FX_BOOL bFill = TRUE);
|
| void SetClipMask(rasterizer_scanline_aa& rasterizer);
|
| void SetClipMask(SkPath& skPath, SkPaint* spaint);
|
| - virtual FX_LPBYTE GetBuffer() const {return m_pAggDriver->GetBuffer();}
|
| + virtual uint8_t* GetBuffer() const {return m_pAggDriver->GetBuffer();}
|
|
|
| CFX_AggDeviceDriver* m_pAggDriver;
|
| };
|
|
|