summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/dib/cfx_imagerenderer.cpp2
-rw-r--r--core/fxge/dib/cfx_imagestretcher.cpp1
-rw-r--r--core/fxge/dib/cfx_imagetransformer.cpp2
-rw-r--r--core/fxge/dib/cstretchengine.cpp5
4 files changed, 2 insertions, 8 deletions
diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index aa818555b6..cff95fdd70 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -101,10 +101,8 @@ bool CFX_ImageRenderer::Start(const CFX_RetainPtr<CFX_DIBitmap>& pDevice,
bool CFX_ImageRenderer::Continue(IFX_Pause* pPause) {
if (m_Status == 1)
return m_Stretcher->Continue(pPause);
-
if (m_Status != 2)
return false;
-
if (m_pTransformer->Continue(pPause))
return true;
diff --git a/core/fxge/dib/cfx_imagestretcher.cpp b/core/fxge/dib/cfx_imagestretcher.cpp
index e0ba750c3c..d633318feb 100644
--- a/core/fxge/dib/cfx_imagestretcher.cpp
+++ b/core/fxge/dib/cfx_imagestretcher.cpp
@@ -128,7 +128,6 @@ bool CFX_ImageStretcher::Start() {
bool CFX_ImageStretcher::Continue(IFX_Pause* pPause) {
if (m_Flags & FXDIB_DOWNSAMPLE)
return ContinueQuickStretch(pPause);
-
return ContinueStretch(pPause);
}
diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index b34c555a76..4b5fe0b0e0 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -262,10 +262,8 @@ bool CFX_ImageTransformer::Continue(IFX_Pause* pPause) {
if (m_Status == 2)
return m_Stretcher->Continue(pPause);
-
if (m_Status != 3)
return false;
-
if (m_Stretcher->Continue(pPause))
return true;
diff --git a/core/fxge/dib/cstretchengine.cpp b/core/fxge/dib/cstretchengine.cpp
index 0025331486..9fdaa02f95 100644
--- a/core/fxge/dib/cstretchengine.cpp
+++ b/core/fxge/dib/cstretchengine.cpp
@@ -357,9 +357,9 @@ CStretchEngine::~CStretchEngine() {
bool CStretchEngine::Continue(IFX_Pause* pPause) {
while (m_State == 1) {
- if (ContinueStretchHorz(pPause)) {
+ if (ContinueStretchHorz(pPause))
return true;
- }
+
m_State = 2;
StretchVert();
}
@@ -401,7 +401,6 @@ bool CStretchEngine::StartStretchHorz() {
bool CStretchEngine::ContinueStretchHorz(IFX_Pause* pPause) {
if (!m_DestWidth)
return false;
-
if (m_pSource->SkipToScanline(m_CurRow, pPause))
return true;