pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #67967

Browse Source
This commit is contained in:
Kirill Polyakov
2024-06-06 08:51:59 +03:00
parent 33da43b2f4
commit ac721572f2
3 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
DesktopEditor/raster/Metafile/svg/SvgObjects/CGradient.cpp
View File

@ -52,37 +52,21 @@ namespace SVG
bool CGradient::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)
{
if (NULL == pRenderer)
if (NULL == pRenderer || m_arObjects.empty())
return false;
if (m_arObjects.empty())
{
if (m_wsXlinkHref.empty() || NULL == pFile)
return false;
std::vector<LONG> arColors;
std::vector<double> arPositions;
CGradient *pGradiend = dynamic_cast<CGradient*>(pFile->GetMarkedObject(m_wsXlinkHref));
if (NULL == pGradiend)
return false;
pGradiend->Apply(pRenderer, pFile, oObjectBounds);
}
else
for (const CStopElement* pStopElement : m_arObjects)
{
std::vector<LONG> arColors;
std::vector<double> arPositions;
for (const CStopElement* pStopElement : m_arObjects)
{
arColors.push_back(((unsigned int)(pStopElement->GetColor().ToInt() | ((unsigned char)(255. * pStopElement->GetColor().GetOpacity()) << 24))));
arPositions.push_back(pStopElement->GetOffset().ToDouble());
}
pRenderer->put_BrushGradientColors(arColors.data(), arPositions.data(), arColors.size());
arColors.push_back(((unsigned int)(pStopElement->GetColor().ToInt() | ((unsigned char)(255. * pStopElement->GetColor().GetOpacity()) << 24))));
arPositions.push_back(pStopElement->GetOffset().ToDouble());
}
pRenderer->put_BrushGradientColors(arColors.data(), arPositions.data(), arColors.size());
pRenderer->put_BrushTransform(m_oTransform.GetMatrix().GetFinalValue());
return true;
}
@ -108,6 +92,31 @@ namespace SVG
pRenderer->BrushBounds(oNewBounds.m_dLeft, oNewBounds.m_dTop, oNewBounds.m_dRight - oNewBounds.m_dLeft, oNewBounds.m_dBottom - oNewBounds.m_dTop);
}
CGradient *CGradient::GetRefGradient(const CSvgFile *pFile) const
{
if (m_wsXlinkHref.empty() || NULL == pFile)
return NULL;
CGradient *pGradiend = dynamic_cast<CGradient*>(pFile->GetMarkedObject(m_wsXlinkHref));
if (NULL == pGradiend)
return NULL;
CGradient *pRefGradient = pGradiend->GetRefGradient(pFile);
return (NULL != pRefGradient) ? pRefGradient : pGradiend;
}
bool CGradient::ApplyRefGradient(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) const
{
CGradient *pRefGradient = GetRefGradient(pFile);
if (NULL == pRefGradient)
return false;
return pRefGradient->Apply(pRenderer, pFile, oObjectBounds);
}
CLinearGradient::CLinearGradient(XmlUtils::CXmlNode& oNode)
: CGradient(oNode)
{
@ -120,10 +129,8 @@ namespace SVG
bool CLinearGradient::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)
{
if (!CGradient::Apply(pRenderer, pFile, oObjectBounds))
return false;
return ApplyRefGradient(pRenderer, pFile, oObjectBounds);
pRenderer->put_BrushType(c_BrushTypePathGradient1);
if (m_oX1 == m_oX2 && m_oY1 == m_oY2)
{
pRenderer->put_BrushType(c_BrushTypeSolid);
@ -132,6 +139,8 @@ namespace SVG
return true;
}
pRenderer->put_BrushType(c_BrushTypePathGradient1);
double dAngle = 0.;
TBounds oNewBounds(oObjectBounds);
@ -171,8 +180,8 @@ namespace SVG
bool CRadialGradient::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)
{
if (!CGradient::Apply(pRenderer, pFile, oObjectBounds) || m_oR.Zero())
return false;
return ApplyRefGradient(pRenderer, pFile, oObjectBounds);
double dCX = (oObjectBounds.m_dRight + oObjectBounds.m_dLeft) / 2.;
double dCY = (oObjectBounds.m_dBottom + oObjectBounds.m_dTop) / 2.;
double dR = oObjectBounds.m_dBottom - oObjectBounds.m_dTop;

3
DesktopEditor/raster/Metafile/svg/SvgObjects/CGradient.h
View File

@ -47,6 +47,9 @@ namespace SVG
bool Apply(IRenderer* pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) override;
void ApplyTransform(IRenderer *pRenderer, const TBounds& oBounds, double& dAngle) const;
private:
CGradient* GetRefGradient(const CSvgFile *pFile) const;
bool ApplyRefGradient(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) const;
std::wstring m_wsXlinkHref;
GradientUnits m_enGradientUnits;
SpreadMethod m_enSpreadMethod;