diff options
Diffstat (limited to 'core/fxge/dib')
-rw-r--r-- | core/fxge/dib/cfx_bitmapcomposer.h | 6 | ||||
-rw-r--r-- | core/fxge/dib/cfx_bitmapstorer.h | 6 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagestretcher.cpp | 2 | ||||
-rw-r--r-- | core/fxge/dib/cfx_imagestretcher.h | 6 | ||||
-rw-r--r-- | core/fxge/dib/cstretchengine.cpp | 4 | ||||
-rw-r--r-- | core/fxge/dib/cstretchengine.h | 6 | ||||
-rw-r--r-- | core/fxge/dib/scanlinecomposer_iface.h (renamed from core/fxge/dib/ifx_scanlinecomposer.h) | 10 |
7 files changed, 20 insertions, 20 deletions
diff --git a/core/fxge/dib/cfx_bitmapcomposer.h b/core/fxge/dib/cfx_bitmapcomposer.h index 98c1f77847..f1bf0e9f32 100644 --- a/core/fxge/dib/cfx_bitmapcomposer.h +++ b/core/fxge/dib/cfx_bitmapcomposer.h @@ -13,12 +13,12 @@ #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_scanlinecompositor.h" -#include "core/fxge/dib/ifx_scanlinecomposer.h" +#include "core/fxge/dib/scanlinecomposer_iface.h" class CFX_ClipRgn; class CFX_DIBitmap; -class CFX_BitmapComposer : public IFX_ScanlineComposer { +class CFX_BitmapComposer : public ScanlineComposerIface { public: CFX_BitmapComposer(); ~CFX_BitmapComposer() override; @@ -35,7 +35,7 @@ class CFX_BitmapComposer : public IFX_ScanlineComposer { int alpha_flag, int blend_type); - // IFX_ScanlineComposer + // ScanlineComposerIface bool SetInfo(int width, int height, FXDIB_Format src_format, diff --git a/core/fxge/dib/cfx_bitmapstorer.h b/core/fxge/dib/cfx_bitmapstorer.h index 3d3416daa1..7d3482fc3f 100644 --- a/core/fxge/dib/cfx_bitmapstorer.h +++ b/core/fxge/dib/cfx_bitmapstorer.h @@ -13,15 +13,15 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxge/dib/cfx_dibitmap.h" -#include "core/fxge/dib/ifx_scanlinecomposer.h" +#include "core/fxge/dib/scanlinecomposer_iface.h" #include "third_party/base/stl_util.h" -class CFX_BitmapStorer : public IFX_ScanlineComposer { +class CFX_BitmapStorer : public ScanlineComposerIface { public: CFX_BitmapStorer(); ~CFX_BitmapStorer() override; - // IFX_ScanlineComposer + // ScanlineComposerIface void ComposeScanline(int line, const uint8_t* scanline, const uint8_t* scan_extra_alpha) override; diff --git a/core/fxge/dib/cfx_imagestretcher.cpp b/core/fxge/dib/cfx_imagestretcher.cpp index af93b266c7..9d8e290b43 100644 --- a/core/fxge/dib/cfx_imagestretcher.cpp +++ b/core/fxge/dib/cfx_imagestretcher.cpp @@ -42,7 +42,7 @@ std::tuple<int, int, int, int> CmykDecode(const uint32_t cmyk) { } // namespace -CFX_ImageStretcher::CFX_ImageStretcher(IFX_ScanlineComposer* pDest, +CFX_ImageStretcher::CFX_ImageStretcher(ScanlineComposerIface* pDest, const RetainPtr<CFX_DIBSource>& pSource, int dest_width, int dest_height, diff --git a/core/fxge/dib/cfx_imagestretcher.h b/core/fxge/dib/cfx_imagestretcher.h index e2ed4e990b..113372571b 100644 --- a/core/fxge/dib/cfx_imagestretcher.h +++ b/core/fxge/dib/cfx_imagestretcher.h @@ -13,7 +13,7 @@ #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" -#include "core/fxge/dib/ifx_scanlinecomposer.h" +#include "core/fxge/dib/scanlinecomposer_iface.h" #include "core/fxge/fx_dib.h" class CFX_DIBSource; @@ -21,7 +21,7 @@ class PauseIndicatorIface; class CFX_ImageStretcher { public: - CFX_ImageStretcher(IFX_ScanlineComposer* pDest, + CFX_ImageStretcher(ScanlineComposerIface* pDest, const RetainPtr<CFX_DIBSource>& pSource, int dest_width, int dest_height, @@ -40,7 +40,7 @@ class CFX_ImageStretcher { bool ContinueQuickStretch(PauseIndicatorIface* pPause); bool ContinueStretch(PauseIndicatorIface* pPause); - UnownedPtr<IFX_ScanlineComposer> const m_pDest; + UnownedPtr<ScanlineComposerIface> const m_pDest; RetainPtr<CFX_DIBSource> m_pSource; std::unique_ptr<CStretchEngine> m_pStretchEngine; std::unique_ptr<uint8_t, FxFreeDeleter> m_pScanline; diff --git a/core/fxge/dib/cstretchengine.cpp b/core/fxge/dib/cstretchengine.cpp index cb7ffa0166..2915202daf 100644 --- a/core/fxge/dib/cstretchengine.cpp +++ b/core/fxge/dib/cstretchengine.cpp @@ -12,7 +12,7 @@ #include "core/fxcrt/pauseindicator_iface.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_dibsource.h" -#include "core/fxge/dib/ifx_scanlinecomposer.h" +#include "core/fxge/dib/scanlinecomposer_iface.h" #include "core/fxge/fx_dib.h" namespace { @@ -217,7 +217,7 @@ int* CStretchEngine::CWeightTable::GetValueFromPixelWeight(PixelWeight* pWeight, return idx < GetPixelWeightSize() ? &pWeight->m_Weights[idx] : nullptr; } -CStretchEngine::CStretchEngine(IFX_ScanlineComposer* pDestBitmap, +CStretchEngine::CStretchEngine(ScanlineComposerIface* pDestBitmap, FXDIB_Format dest_format, int dest_width, int dest_height, diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h index 6f0d4dc54d..91530cc01f 100644 --- a/core/fxge/dib/cstretchengine.h +++ b/core/fxge/dib/cstretchengine.h @@ -15,11 +15,11 @@ #include "core/fxge/fx_dib.h" class PauseIndicatorIface; -class IFX_ScanlineComposer; +class ScanlineComposerIface; class CStretchEngine { public: - CStretchEngine(IFX_ScanlineComposer* pDestBitmap, + CStretchEngine(ScanlineComposerIface* pDestBitmap, FXDIB_Format dest_format, int dest_width, int dest_height, @@ -61,7 +61,7 @@ class CStretchEngine { int m_DestBpp; int m_SrcBpp; int m_bHasAlpha; - UnownedPtr<IFX_ScanlineComposer> m_pDestBitmap; + UnownedPtr<ScanlineComposerIface> m_pDestBitmap; int m_DestWidth; int m_DestHeight; FX_RECT m_DestClip; diff --git a/core/fxge/dib/ifx_scanlinecomposer.h b/core/fxge/dib/scanlinecomposer_iface.h index 7b070c02ff..2a8fbbccdf 100644 --- a/core/fxge/dib/ifx_scanlinecomposer.h +++ b/core/fxge/dib/scanlinecomposer_iface.h @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FXGE_DIB_IFX_SCANLINECOMPOSER_H_ -#define CORE_FXGE_DIB_IFX_SCANLINECOMPOSER_H_ +#ifndef CORE_FXGE_DIB_SCANLINECOMPOSER_IFACE_H_ +#define CORE_FXGE_DIB_SCANLINECOMPOSER_IFACE_H_ #include "core/fxge/fx_dib.h" -class IFX_ScanlineComposer { +class ScanlineComposerIface { public: - virtual ~IFX_ScanlineComposer() {} + virtual ~ScanlineComposerIface() {} virtual void ComposeScanline(int line, const uint8_t* scanline, @@ -23,4 +23,4 @@ class IFX_ScanlineComposer { uint32_t* pSrcPalette) = 0; }; -#endif // CORE_FXGE_DIB_IFX_SCANLINECOMPOSER_H_ +#endif // CORE_FXGE_DIB_SCANLINECOMPOSER_IFACE_H_ |