| Index: xfa/src/fdp/src/fde/fde_gedevice.cpp
|
| diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp
|
| index fb124e3b4d633db723c8b49f0544c7d1c8b87257..1abb656feabbd64e64392b85c9fd49fb284e4bcf 100644
|
| --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp
|
| +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp
|
| @@ -10,23 +10,18 @@
|
| #include "xfa/src/fdp/src/fde/fde_gedevice.h"
|
| #include "xfa/src/fdp/src/fde/fde_geobject.h"
|
| #include "xfa/src/foxitlib.h"
|
| -#ifndef _FDEPLUS
|
| -#ifdef _cplusplus
|
| -exten "C" {
|
| -#endif
|
| - FX_BOOL FDE_GetStockHatchMask(int32_t iHatchStyle, CFX_DIBitmap & hatchMask) {
|
| - FDE_LPCHATCHDATA pData = FDE_DEVGetHatchData(iHatchStyle);
|
| - if (!pData) {
|
| - return FALSE;
|
| - }
|
| - hatchMask.Create(pData->iWidth, pData->iHeight, FXDIB_1bppMask);
|
| - FXSYS_memcpy(hatchMask.GetBuffer(), pData->MaskBits,
|
| - hatchMask.GetPitch() * pData->iHeight);
|
| - return TRUE;
|
| +
|
| +FX_BOOL FDE_GetStockHatchMask(int32_t iHatchStyle, CFX_DIBitmap& hatchMask) {
|
| + FDE_LPCHATCHDATA pData = FDE_DEVGetHatchData(iHatchStyle);
|
| + if (!pData) {
|
| + return FALSE;
|
| }
|
| -#ifdef _cplusplus
|
| + hatchMask.Create(pData->iWidth, pData->iHeight, FXDIB_1bppMask);
|
| + FXSYS_memcpy(hatchMask.GetBuffer(), pData->MaskBits,
|
| + hatchMask.GetPitch() * pData->iHeight);
|
| + return TRUE;
|
| }
|
| -#endif
|
| +
|
| IFDE_RenderDevice* IFDE_RenderDevice::Create(CFX_DIBitmap* pBitmap,
|
| FX_BOOL bRgbByteOrder) {
|
| if (pBitmap == NULL) {
|
| @@ -169,7 +164,7 @@ FX_BOOL CFDE_FxgeDevice::DrawString(IFDE_Brush* pBrush,
|
| SubstFxFont.m_WeightCJK = SubstFxFont.m_Weight;
|
| SubstFxFont.m_ItalicAngle = dwFontStyle & FX_FONTSTYLE_Italic ? -12 : 0;
|
| SubstFxFont.m_bItlicCJK = !!(dwFontStyle & FX_FONTSTYLE_Italic);
|
| -#endif
|
| +#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| for (int32_t i = 0; i < iCount; ++i) {
|
| pSTFont = pFont->GetSubstFont((int32_t)pCP->m_GlyphIndex);
|
| pCP->m_GlyphIndex &= 0x00FFFFFF;
|
| @@ -186,7 +181,7 @@ FX_BOOL CFDE_FxgeDevice::DrawString(IFDE_Brush* pBrush,
|
| m_pDevice->DrawNormalText(iCurCount, pCurCP, pFxFont, pCache,
|
| -fFontSize, (const CFX_Matrix*)pMatrix,
|
| argb, FXTEXT_CLEARTYPE);
|
| -#endif
|
| +#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| }
|
| pCurFont = pSTFont;
|
| pCurCP = pCP;
|
| @@ -210,12 +205,12 @@ FX_BOOL CFDE_FxgeDevice::DrawString(IFDE_Brush* pBrush,
|
| return m_pDevice->DrawNormalText(iCurCount, pCurCP, pFxFont, pCache,
|
| -fFontSize, (const CFX_Matrix*)pMatrix,
|
| argb, FXTEXT_CLEARTYPE);
|
| -#endif
|
| +#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| }
|
| #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| FxFont.SetSubstFont(nullptr);
|
| FxFont.SetFace(nullptr);
|
| -#endif
|
| +#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| return TRUE;
|
| } break;
|
| default:
|
| @@ -576,4 +571,3 @@ FX_BOOL CFDE_FxgeDevice::FillLinearGradientPath(IFDE_Brush* pBrush,
|
| }
|
| return WrapTexture(pLinearBrush->GetWrapMode(), &bmp, pPath, pMatrix);
|
| }
|
| -#endif
|
|
|