Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / pdfium / core / src / fpdfapi / fpdf_render / render_int.h

diff --git a/src/third_party/pdfium/core/src/fpdfapi/fpdf_render/render_int.h b/src/third_party/pdfium/core/src/fpdfapi/fpdf_render/render_int.h
index fda3666..f9a04a9 100644 (file)
--- a/src/third_party/pdfium/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/src/third_party/pdfium/core/src/fpdfapi/fpdf_render/render_int.h
@@ -412,6 +412,7 @@ public:
     FX_BOOL                            m_bHasMask;
 protected:
     FX_BOOL                            LoadColorInfo(CPDF_Dictionary* pFormResources, CPDF_Dictionary* pPageResources);
+    DIB_COMP_DATA*      GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX_BOOL& bColorKey);
     CPDF_DIBSource*            LoadMask(FX_DWORD& MatteColor);
     CPDF_DIBSource*            LoadMaskDIB(CPDF_Stream* pMask);
     void                               LoadJpxBitmap();
@@ -419,13 +420,13 @@ protected:
     void                               LoadPalette();
     FX_BOOL                            CreateDecoder();
     void                               TranslateScanline24bpp(FX_LPBYTE dest_scan, FX_LPCBYTE src_scan) const;
-    FX_DWORD            GetValidBpc() const;
+    void                ValidateDictParam();
     CPDF_Document*             m_pDocument;
     const CPDF_Stream* m_pStream;
     CPDF_StreamAcc*            m_pStreamAcc;
     const CPDF_Dictionary*     m_pDict;
     CPDF_ColorSpace*   m_pColorSpace;
-    FX_DWORD                   m_Family, m_bpc, m_nComponents, m_GroupFamily;
+    FX_DWORD                   m_Family, m_bpc, m_bpc_orig, m_nComponents, m_GroupFamily;
     FX_BOOL                            m_bLoadMask;
     FX_BOOL                            m_bDefaultDecode, m_bImageMask, m_bColorKey;
     DIB_COMP_DATA*             m_pCompData;