Cleanup: Remove dead CPDF_InlineImages code.
authorLei Zhang <thestig@chromium.org>
Fri, 19 Jun 2015 22:11:20 +0000 (15:11 -0700)
committerLei Zhang <thestig@chromium.org>
Fri, 19 Jun 2015 22:11:20 +0000 (15:11 -0700)
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1192413007.

core/include/fpdfapi/fpdf_pageobj.h
core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
core/src/fpdfapi/fpdf_render/render_int.h

index af186ad..22edf5d 100644 (file)
@@ -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_
index b09867b..ad5dc58 100644 (file)
@@ -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;
 }
index 77acb15..03fc9d6 100644 (file)
@@ -139,7 +139,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);