From ac66da22f47bd9081652f235754edad59ef876f3 Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Fri, 31 Mar 2017 14:38:21 -0400 Subject: Split fx_dib.h part 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Created cpp for CFX_FilteredDIB. - Moved CFX_ScanLineCompositor to its own files. Change-Id: I020e44a9e824d497db4526893d61eb3819af4059 Reviewed-on: https://pdfium-review.googlesource.com/3550 Commit-Queue: Nicolás Peña Reviewed-by: Tom Sepez --- core/fxge/fx_dib.h | 59 +----------------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) (limited to 'core/fxge/fx_dib.h') diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h index 85af766992..f768afddaa 100644 --- a/core/fxge/fx_dib.h +++ b/core/fxge/fx_dib.h @@ -15,6 +15,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_dibsource.h" +#include "core/fxge/dib/cfx_scanlinecompositor.h" #include "third_party/base/stl_util.h" typedef uint32_t FX_ARGB; @@ -142,64 +143,6 @@ class IFX_ScanlineComposer { uint32_t* pSrcPalette) = 0; }; -class CFX_ScanlineCompositor { - public: - CFX_ScanlineCompositor(); - - ~CFX_ScanlineCompositor(); - - bool Init(FXDIB_Format dest_format, - FXDIB_Format src_format, - int32_t width, - uint32_t* pSrcPalette, - uint32_t mask_color, - int blend_type, - bool bClip, - bool bRgbByteOrder = false, - int alpha_flag = 0, - void* pIccTransform = nullptr); - - void CompositeRgbBitmapLine(uint8_t* dest_scan, - const uint8_t* src_scan, - int width, - const uint8_t* clip_scan, - const uint8_t* src_extra_alpha = nullptr, - uint8_t* dst_extra_alpha = nullptr); - - void CompositePalBitmapLine(uint8_t* dest_scan, - const uint8_t* src_scan, - int src_left, - int width, - const uint8_t* clip_scan, - const uint8_t* src_extra_alpha = nullptr, - uint8_t* dst_extra_alpha = nullptr); - - void CompositeByteMaskLine(uint8_t* dest_scan, - const uint8_t* src_scan, - int width, - const uint8_t* clip_scan, - uint8_t* dst_extra_alpha = nullptr); - - void CompositeBitMaskLine(uint8_t* dest_scan, - const uint8_t* src_scan, - int src_left, - int width, - const uint8_t* clip_scan, - uint8_t* dst_extra_alpha = nullptr); - - protected: - int m_Transparency; - FXDIB_Format m_SrcFormat, m_DestFormat; - uint32_t* m_pSrcPalette; - - int m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, m_MaskBlack; - int m_BlendType; - void* m_pIccTransform; - uint8_t* m_pCacheScanline; - int m_CacheSize; - bool m_bRgbByteOrder; -}; - class CFX_BitmapComposer : public IFX_ScanlineComposer { public: CFX_BitmapComposer(); -- cgit v1.2.3