Index: xfa/fde/fde_gedevice.cpp |
diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp |
index 1338dc4a8e0607ccd0980e149db3a4cc4840a778..2b0dbd7815a2af4f9d4ddfcbcdc5732830ffaf34 100644 |
--- a/xfa/fde/fde_gedevice.cpp |
+++ b/xfa/fde/fde_gedevice.cpp |
@@ -11,7 +11,6 @@ |
#include "xfa/fde/fde_brush.h" |
#include "xfa/fde/fde_devbasic.h" |
#include "xfa/fde/fde_geobject.h" |
-#include "xfa/fde/fde_image.h" |
#include "xfa/fde/fde_pen.h" |
FX_BOOL FDE_GetStockHatchMask(int32_t iHatchStyle, CFX_DIBitmap& hatchMask) { |
@@ -446,24 +445,7 @@ FX_BOOL CFDE_FxgeDevice::FillHatchPath(IFDE_Brush* pBrush, |
FX_BOOL CFDE_FxgeDevice::FillTexturePath(IFDE_Brush* pBrush, |
const CFX_PathData* pPath, |
const CFX_Matrix* pMatrix) { |
- FXSYS_assert(pPath && pBrush && pBrush->GetType() == FDE_BRUSHTYPE_Texture); |
- IFDE_TextureBrush* pTextureBrush = static_cast<IFDE_TextureBrush*>(pBrush); |
- IFDE_Image* pImage = pTextureBrush->GetImage(); |
dsinclair
2016/04/07 14:35:27
This would just early exist as GetImage would alwa
|
- if (!pImage) |
- return FALSE; |
- |
- CFX_Size size(pImage->GetImageWidth(), pImage->GetImageHeight()); |
- CFX_DIBitmap bmp; |
- bmp.Create(size.x, size.y, FXDIB_Argb); |
- if (!pImage->StartLoadImage(&bmp, 0, 0, size.x, size.y, 0, 0, size.x, |
- size.y)) { |
- return FALSE; |
- } |
- if (pImage->DoLoadImage() < 100) { |
- return FALSE; |
- } |
- pImage->StopLoadImage(); |
- return WrapTexture(pTextureBrush->GetWrapMode(), &bmp, pPath, pMatrix); |
+ return FALSE; |
} |
FX_BOOL CFDE_FxgeDevice::WrapTexture(int32_t iWrapMode, |
const CFX_DIBitmap* pBitmap, |