SalBitmap::Replace is not implemented by any backend
so just remove it and use the fallback Change-Id: I980f67b31f22c731eb966408b58ce95477a9573d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190650 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
This commit is contained in:
@@ -250,9 +250,4 @@ bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/,
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SvpSalBitmap::Replace( const ::Color& /*rSearchColor*/, const ::Color& /*rReplaceColor*/, sal_uInt8 /*nTol*/ )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@@ -61,7 +61,6 @@ public:
|
||||
|
||||
SAL_DLLPRIVATE virtual bool ScalingSupported() const override;
|
||||
SAL_DLLPRIVATE virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
|
||||
SAL_DLLPRIVATE virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override;
|
||||
};
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@@ -53,8 +53,6 @@ public:
|
||||
virtual bool ScalingSupported() const override;
|
||||
virtual bool Scale(const double& rScaleX, const double& rScaleY,
|
||||
BmpScaleFlag nScaleFlag) override;
|
||||
virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor,
|
||||
sal_uInt8 nTol) override;
|
||||
};
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|
||||
|
||||
@@ -74,7 +74,6 @@ public:
|
||||
|
||||
bool ScalingSupported() const override;
|
||||
bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
|
||||
bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override;
|
||||
|
||||
private:
|
||||
// quartz helper
|
||||
|
||||
@@ -80,8 +80,6 @@ public:
|
||||
virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) = 0;
|
||||
void DropScaledCache();
|
||||
|
||||
virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) = 0;
|
||||
|
||||
virtual bool ConvertToGreyscale()
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -56,8 +56,6 @@ public:
|
||||
virtual bool ScalingSupported() const override;
|
||||
virtual bool Scale(const double& rScaleX, const double& rScaleY,
|
||||
BmpScaleFlag nScaleFlag) override;
|
||||
virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor,
|
||||
sal_uInt8 nTol) override;
|
||||
virtual bool InterpretAs8Bit() override;
|
||||
virtual bool ConvertToGreyscale() override;
|
||||
virtual bool Erase(const Color& color) override;
|
||||
|
||||
@@ -84,7 +84,6 @@ public:
|
||||
|
||||
virtual bool ScalingSupported() const override;
|
||||
virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
|
||||
virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override;
|
||||
};
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@@ -178,10 +178,4 @@ bool QtBitmap::Scale(const double& /*rScaleX*/, const double& /*rScaleY*/,
|
||||
return false;
|
||||
}
|
||||
|
||||
bool QtBitmap::Replace(const Color& /*rSearchColor*/, const Color& /*rReplaceColor*/,
|
||||
sal_uInt8 /*nTol*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|
||||
|
||||
@@ -655,9 +655,4 @@ bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*
|
||||
return false;
|
||||
}
|
||||
|
||||
bool QuartzSalBitmap::Replace( const Color& /*rSearchColor*/, const Color& /*rReplaceColor*/, sal_uInt8 /*nTol*/ )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@@ -440,14 +440,6 @@ bool SkiaSalBitmap::Scale(const double& rScaleX, const double& rScaleY, BmpScale
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SkiaSalBitmap::Replace(const Color&, const Color&, sal_uInt8)
|
||||
{
|
||||
#ifdef DBG_UTIL
|
||||
assert(mWriteAccessCount == 0);
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SkiaSalBitmap::ConvertToGreyscale()
|
||||
{
|
||||
#ifdef DBG_UTIL
|
||||
|
||||
@@ -947,19 +947,6 @@ bool Bitmap::Replace(const AlphaMask& rAlpha, const Color& rMergeColor)
|
||||
|
||||
bool Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol)
|
||||
{
|
||||
if (mxSalBmp)
|
||||
{
|
||||
// implementation specific replace
|
||||
std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap());
|
||||
if (xImpBmp->Create(*mxSalBmp) && xImpBmp->Replace(rSearchColor, rReplaceColor, nTol))
|
||||
{
|
||||
ImplSetSalBitmap(xImpBmp);
|
||||
maPrefMapMode = MapMode(MapUnit::MapPixel);
|
||||
maPrefSize = xImpBmp->GetSize();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
BitmapScopedWriteAccess pAcc(*this);
|
||||
if (!pAcc)
|
||||
return false;
|
||||
|
||||
@@ -540,9 +540,4 @@ bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/,
|
||||
return false;
|
||||
}
|
||||
|
||||
bool WinSalBitmap::Replace( const Color& /*rSearchColor*/, const Color& /*rReplaceColor*/, sal_uInt8 /*nTol*/ )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
Reference in New Issue
Block a user