| Index: core/fxge/agg/fx_agg_driver.cpp
|
| diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
|
| index 86326f6caf738c5666250b24fb8eb79703e631ef..d7a9ddb530f59b423d7a5958705934566fa48df2 100644
|
| --- a/core/fxge/agg/fx_agg_driver.cpp
|
| +++ b/core/fxge/agg/fx_agg_driver.cpp
|
| @@ -189,17 +189,15 @@ IFX_RenderDeviceDriver* IFX_RenderDeviceDriver::CreateFxgeDriver(
|
| FX_BOOL bRgbByteOrder,
|
| CFX_DIBitmap* pOriDevice,
|
| FX_BOOL bGroupKnockout) {
|
| - return new CFX_AggDeviceDriver(pBitmap, 0, bRgbByteOrder, pOriDevice,
|
| + return new CFX_AggDeviceDriver(pBitmap, bRgbByteOrder, pOriDevice,
|
| bGroupKnockout);
|
| }
|
|
|
| CFX_AggDeviceDriver::CFX_AggDeviceDriver(CFX_DIBitmap* pBitmap,
|
| - int dither_bits,
|
| FX_BOOL bRgbByteOrder,
|
| CFX_DIBitmap* pOriDevice,
|
| FX_BOOL bGroupKnockout) {
|
| m_pBitmap = pBitmap;
|
| - m_DitherBits = dither_bits;
|
| m_pClipRgn = nullptr;
|
| m_pPlatformBitmap = nullptr;
|
| m_pPlatformGraphics = nullptr;
|
| @@ -270,8 +268,6 @@ int CFX_AggDeviceDriver::GetDeviceCaps(int caps_id) {
|
| }
|
| return flags;
|
| }
|
| - case FXDC_DITHER_BITS:
|
| - return m_DitherBits;
|
| }
|
| return 0;
|
| }
|
| @@ -1784,16 +1780,15 @@ CFX_FxgeDevice::CFX_FxgeDevice() {
|
| }
|
|
|
| bool CFX_FxgeDevice::Attach(CFX_DIBitmap* pBitmap,
|
| - int dither_bits,
|
| bool bRgbByteOrder,
|
| CFX_DIBitmap* pOriDevice,
|
| bool bGroupKnockout) {
|
| - if (!pBitmap) {
|
| + if (!pBitmap)
|
| return false;
|
| - }
|
| +
|
| SetBitmap(pBitmap);
|
| IFX_RenderDeviceDriver* pDriver = new CFX_AggDeviceDriver(
|
| - pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout);
|
| + pBitmap, bRgbByteOrder, pOriDevice, bGroupKnockout);
|
| SetDeviceDriver(pDriver);
|
| return true;
|
| }
|
| @@ -1801,7 +1796,6 @@ bool CFX_FxgeDevice::Attach(CFX_DIBitmap* pBitmap,
|
| bool CFX_FxgeDevice::Create(int width,
|
| int height,
|
| FXDIB_Format format,
|
| - int dither_bits,
|
| CFX_DIBitmap* pOriDevice) {
|
| m_bOwnedBitmap = true;
|
| CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
|
| @@ -1811,7 +1805,7 @@ bool CFX_FxgeDevice::Create(int width,
|
| }
|
| SetBitmap(pBitmap);
|
| IFX_RenderDeviceDriver* pDriver =
|
| - new CFX_AggDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
|
| + new CFX_AggDeviceDriver(pBitmap, FALSE, pOriDevice, FALSE);
|
| SetDeviceDriver(pDriver);
|
| return true;
|
| }
|
|
|