summaryrefslogtreecommitdiff
path: root/core/fxge/dib
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/dib')
-rw-r--r--core/fxge/dib/cfx_dibsource.cpp3
-rw-r--r--core/fxge/dib/cfx_dibsource.h4
-rw-r--r--core/fxge/dib/cfx_imagerenderer.cpp2
-rw-r--r--core/fxge/dib/cfx_imagerenderer.h2
-rw-r--r--core/fxge/dib/cfx_imagestretcher.cpp6
-rw-r--r--core/fxge/dib/cfx_imagestretcher.h8
-rw-r--r--core/fxge/dib/cfx_imagetransformer.cpp2
-rw-r--r--core/fxge/dib/cfx_imagetransformer.h2
-rw-r--r--core/fxge/dib/cstretchengine.cpp6
-rw-r--r--core/fxge/dib/cstretchengine.h6
10 files changed, 21 insertions, 20 deletions
diff --git a/core/fxge/dib/cfx_dibsource.cpp b/core/fxge/dib/cfx_dibsource.cpp
index 104b3caf96..86bec23c67 100644
--- a/core/fxge/dib/cfx_dibsource.cpp
+++ b/core/fxge/dib/cfx_dibsource.cpp
@@ -726,7 +726,8 @@ uint8_t* CFX_DIBSource::GetBuffer() const {
return nullptr;
}
-bool CFX_DIBSource::SkipToScanline(int line, IFX_PauseIndicator* pPause) const {
+bool CFX_DIBSource::SkipToScanline(int line,
+ PauseIndicatorIface* pPause) const {
return false;
}
diff --git a/core/fxge/dib/cfx_dibsource.h b/core/fxge/dib/cfx_dibsource.h
index 02cae5d0f2..0e7fb27dde 100644
--- a/core/fxge/dib/cfx_dibsource.h
+++ b/core/fxge/dib/cfx_dibsource.h
@@ -27,7 +27,7 @@ enum FXDIB_Channel {
class CFX_ClipRgn;
class CFX_DIBitmap;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CFX_DIBSource : public Retainable {
public:
@@ -35,7 +35,7 @@ class CFX_DIBSource : public Retainable {
virtual uint8_t* GetBuffer() const;
virtual const uint8_t* GetScanline(int line) const = 0;
- virtual bool SkipToScanline(int line, IFX_PauseIndicator* pPause) const;
+ virtual bool SkipToScanline(int line, PauseIndicatorIface* pPause) const;
virtual void DownSampleScanline(int line,
uint8_t* dest_scan,
int dest_bpp,
diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index 658d363c89..a196068a2e 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -87,7 +87,7 @@ CFX_ImageRenderer::CFX_ImageRenderer(const RetainPtr<CFX_DIBitmap>& pDevice,
CFX_ImageRenderer::~CFX_ImageRenderer() {}
-bool CFX_ImageRenderer::Continue(IFX_PauseIndicator* pPause) {
+bool CFX_ImageRenderer::Continue(PauseIndicatorIface* pPause) {
if (m_Status == 1)
return m_Stretcher->Continue(pPause);
if (m_Status != 2)
diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h
index 18a56e2782..14eaf56ff8 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/dib/cfx_imagerenderer.h
@@ -33,7 +33,7 @@ class CFX_ImageRenderer {
bool bRgbByteOrder);
~CFX_ImageRenderer();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
private:
const RetainPtr<CFX_DIBitmap> m_pDevice;
diff --git a/core/fxge/dib/cfx_imagestretcher.cpp b/core/fxge/dib/cfx_imagestretcher.cpp
index 03518c688e..af93b266c7 100644
--- a/core/fxge/dib/cfx_imagestretcher.cpp
+++ b/core/fxge/dib/cfx_imagestretcher.cpp
@@ -124,7 +124,7 @@ bool CFX_ImageStretcher::Start() {
return StartStretch();
}
-bool CFX_ImageStretcher::Continue(IFX_PauseIndicator* pPause) {
+bool CFX_ImageStretcher::Continue(PauseIndicatorIface* pPause) {
if (m_Flags & FXDIB_DOWNSAMPLE)
return ContinueQuickStretch(pPause);
return ContinueStretch(pPause);
@@ -142,7 +142,7 @@ bool CFX_ImageStretcher::StartStretch() {
return true;
}
-bool CFX_ImageStretcher::ContinueStretch(IFX_PauseIndicator* pPause) {
+bool CFX_ImageStretcher::ContinueStretch(PauseIndicatorIface* pPause) {
return m_pStretchEngine && m_pStretchEngine->Continue(pPause);
}
@@ -171,7 +171,7 @@ bool CFX_ImageStretcher::StartQuickStretch() {
return true;
}
-bool CFX_ImageStretcher::ContinueQuickStretch(IFX_PauseIndicator* pPause) {
+bool CFX_ImageStretcher::ContinueQuickStretch(PauseIndicatorIface* pPause) {
if (!m_pScanline)
return false;
diff --git a/core/fxge/dib/cfx_imagestretcher.h b/core/fxge/dib/cfx_imagestretcher.h
index 2ecb2a0492..e2ed4e990b 100644
--- a/core/fxge/dib/cfx_imagestretcher.h
+++ b/core/fxge/dib/cfx_imagestretcher.h
@@ -17,7 +17,7 @@
#include "core/fxge/fx_dib.h"
class CFX_DIBSource;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CFX_ImageStretcher {
public:
@@ -30,15 +30,15 @@ class CFX_ImageStretcher {
~CFX_ImageStretcher();
bool Start();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
RetainPtr<CFX_DIBSource> source() { return m_pSource; }
private:
bool StartQuickStretch();
bool StartStretch();
- bool ContinueQuickStretch(IFX_PauseIndicator* pPause);
- bool ContinueStretch(IFX_PauseIndicator* pPause);
+ bool ContinueQuickStretch(PauseIndicatorIface* pPause);
+ bool ContinueStretch(PauseIndicatorIface* pPause);
UnownedPtr<IFX_ScanlineComposer> const m_pDest;
RetainPtr<CFX_DIBSource> m_pSource;
diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index e514153acf..6f3ab86996 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -265,7 +265,7 @@ CFX_ImageTransformer::CFX_ImageTransformer(const RetainPtr<CFX_DIBSource>& pSrc,
CFX_ImageTransformer::~CFX_ImageTransformer() {}
-bool CFX_ImageTransformer::Continue(IFX_PauseIndicator* pPause) {
+bool CFX_ImageTransformer::Continue(PauseIndicatorIface* pPause) {
if (m_Status == 1) {
if (m_Stretcher->Continue(pPause))
return true;
diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h
index d13ce3f130..97dd61f9e1 100644
--- a/core/fxge/dib/cfx_imagetransformer.h
+++ b/core/fxge/dib/cfx_imagetransformer.h
@@ -26,7 +26,7 @@ class CFX_ImageTransformer {
const FX_RECT* pClip);
~CFX_ImageTransformer();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
const FX_RECT& result() const { return m_result; }
RetainPtr<CFX_DIBitmap> DetachBitmap();
diff --git a/core/fxge/dib/cstretchengine.cpp b/core/fxge/dib/cstretchengine.cpp
index 6803959730..cb7ffa0166 100644
--- a/core/fxge/dib/cstretchengine.cpp
+++ b/core/fxge/dib/cstretchengine.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include <utility>
-#include "core/fxcrt/ifx_pauseindicator.h"
+#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"
@@ -311,7 +311,7 @@ CStretchEngine::CStretchEngine(IFX_ScanlineComposer* pDestBitmap,
CStretchEngine::~CStretchEngine() {}
-bool CStretchEngine::Continue(IFX_PauseIndicator* pPause) {
+bool CStretchEngine::Continue(PauseIndicatorIface* pPause) {
while (m_State == 1) {
if (ContinueStretchHorz(pPause))
return true;
@@ -348,7 +348,7 @@ bool CStretchEngine::StartStretchHorz() {
return true;
}
-bool CStretchEngine::ContinueStretchHorz(IFX_PauseIndicator* pPause) {
+bool CStretchEngine::ContinueStretchHorz(PauseIndicatorIface* pPause) {
if (!m_DestWidth)
return false;
if (m_pSource->SkipToScanline(m_CurRow, pPause))
diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h
index 8ce8351304..6f0d4dc54d 100644
--- a/core/fxge/dib/cstretchengine.h
+++ b/core/fxge/dib/cstretchengine.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_dib.h"
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class IFX_ScanlineComposer;
class CStretchEngine {
@@ -28,10 +28,10 @@ class CStretchEngine {
int flags);
~CStretchEngine();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
bool StartStretchHorz();
- bool ContinueStretchHorz(IFX_PauseIndicator* pPause);
+ bool ContinueStretchHorz(PauseIndicatorIface* pPause);
void StretchVert();
class CWeightTable {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 18:36:08 +0000