diff options
| -rw-r--r-- | core/include/fpdfapi/fpdf_pageobj.h | 33 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp | 14 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 1 |
3 files changed, 7 insertions, 41 deletions
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h index af186ad03b..22edf5d504 100644 --- a/core/include/fpdfapi/fpdf_pageobj.h +++ b/core/include/fpdfapi/fpdf_pageobj.h @@ -29,7 +29,6 @@ class CPDF_PathObject; class CPDF_ImageObject; class CPDF_ShadingObject; class CPDF_FormObject; -class CPDF_InlineImages; typedef CFX_PathData CPDF_PathData; class CPDF_Path : public CFX_CountRef<CFX_PathData> @@ -423,12 +422,13 @@ public: FX_BOOL LookupMark(const CFX_ByteStringC& mark, CPDF_Dictionary*& pDict) const; }; -#define PDFPAGE_TEXT 1 -#define PDFPAGE_PATH 2 -#define PDFPAGE_IMAGE 3 -#define PDFPAGE_SHADING 4 -#define PDFPAGE_FORM 5 -#define PDFPAGE_INLINES 6 + +#define PDFPAGE_TEXT 1 +#define PDFPAGE_PATH 2 +#define PDFPAGE_IMAGE 3 +#define PDFPAGE_SHADING 4 +#define PDFPAGE_FORM 5 + class CPDF_GraphicStates { public: @@ -700,23 +700,4 @@ protected: void CopyData(const CPDF_PageObject* pSrcObject) override; }; -class CPDF_InlineImages : public CPDF_PageObject -{ -public: - - CPDF_InlineImages(); - - virtual ~CPDF_InlineImages(); - - CPDF_Stream* m_pStream; - - CFX_DIBitmap* m_pBitmap; - - CFX_ArrayTemplate<CFX_AffineMatrix> m_Matrices; - - void AddMatrix(CFX_AffineMatrix& matrix); -protected: - void Transform(const CFX_AffineMatrix& matrix) override {} -}; - #endif // CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_ diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index b09867b266..ad5dc58a1c 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -323,20 +323,6 @@ FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) m_pForm = NULL; return TRUE; } - if (pPageObj->m_Type == PDFPAGE_INLINES) { - CPDF_InlineImages *pInlines = (CPDF_InlineImages *)pPageObj; - if (pInlines->m_pStream) { - m_ImageMatrix = pInlines->m_Matrices[0]; - CPDF_DIBSource dibsrc; - if (!dibsrc.Load(pContext->m_pDocument, pInlines->m_pStream, NULL, NULL, NULL, NULL)) { - return FALSE; - } - m_pBitmap = dibsrc.Clone(); - delete m_pForm; - m_pForm = NULL; - return TRUE; - } - } } return FALSE; } diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index 7aa8358b8d..8582c01eec 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -134,7 +134,6 @@ protected: const CFX_AffineMatrix* pImage2Device, CPDF_ImageCache* pImageCache, FX_DWORD flags); void CompositeDIBitmap(CFX_DIBitmap* pDIBitmap, int left, int top, FX_ARGB mask_argb, int bitmap_alpha, int blend_mode, int bIsolated); - FX_BOOL ProcessInlines(CPDF_InlineImages* pInlines, const CFX_AffineMatrix* pObj2Device); FX_BOOL ProcessShading(CPDF_ShadingObject* pShadingObj, const CFX_AffineMatrix* pObj2Device); void DrawShading(CPDF_ShadingPattern* pPattern, CFX_AffineMatrix* pMatrix, FX_RECT& clip_rect, int alpha, FX_BOOL bAlphaMode); |