Skip to content

O
onlyoffice_core
Commit 23e5e6d7 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander Trofimov
Browse files
Options

Чтение клипа перенесено в общие, теперь клип читается и для канвы. Убрано... 

Чтение клипа перенесено в общие, теперь клип читается и для канвы. Убрано лишнее копирование строк при работе с патами. Исправлен баг с парсингом Incides и UnicodeString. Исправлен баг с чтением PathGeomerty. Исправлен баг с чтением закрытых патов. 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63581 954022d7-b5bf-4e40-9824-e11837661b57
parent a8c565f6
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 82 deletions
XpsFile/XpsLib/ContextState.cpp
View file @ 23e5e6d7
...@@ -101,7 +101,7 @@ namespace XPS ...@@ -101,7 +101,7 @@ namespace XPS
m_pRenderer->PathCommandStart(); m_pRenderer->PathCommandStart();
m_pRenderer->BeginCommand(c_nClipType); m_pRenderer->BeginCommand(c_nClipType);
m_pRenderer->BeginCommand(c_nPathType); m_pRenderer->BeginCommand(c_nPathType);
bool bWinding = VmlToRenderer(wsClip.c_str(), m_pRenderer); bool bWinding = VmlToRenderer(wsClip, m_pRenderer);
m_pRenderer->put_ClipMode(bWinding ? c_nClipRegionTypeWinding : c_nClipRegionTypeEvenOdd); m_pRenderer->put_ClipMode(bWinding ? c_nClipRegionTypeWinding : c_nClipRegionTypeEvenOdd);
m_pRenderer->EndCommand(c_nPathType); m_pRenderer->EndCommand(c_nPathType);
m_pRenderer->EndCommand(c_nClipType); m_pRenderer->EndCommand(c_nClipType);
...@@ -129,20 +129,14 @@ namespace XPS ...@@ -129,20 +129,14 @@ namespace XPS
return; return;
CWString wsKey((wchar_t*)(_wsKey.c_str() + 16), false, _wsKey.size() - 17); CWString wsKey((wchar_t*)(_wsKey.c_str() + 16), false, _wsKey.size() - 17);
const wchar_t* wsPath;
CStaticResource* pResource; CStaticResource* pResource;
for (int nIndex = m_vResourcesStack.size() - 1; nIndex >= 0; nIndex--) for (int nIndex = m_vResourcesStack.size() - 1; nIndex >= 0; nIndex--)
{ {
pResource = m_vResourcesStack.at(nIndex).pResource; pResource = m_vResourcesStack.at(nIndex).pResource;
wsPath = pResource->GetFigure(wsKey); if (pResource->GetFigure(wsKey, wsPathData))
if (NULL != wsPath)
{
wsPathData.create(wsPath, true);
return; return;
} }
} }
}
CBrush* CContextState::GetBrush(const CWString& _wsKey) CBrush* CContextState::GetBrush(const CWString& _wsKey)
{ {
if (_wsKey.size() < 17) if (_wsKey.size() < 17)
...@@ -168,18 +162,12 @@ namespace XPS ...@@ -168,18 +162,12 @@ namespace XPS
return; return;
CWString wsKey((wchar_t*)(_wsKey.c_str() + 16), false, _wsKey.size() - 17); CWString wsKey((wchar_t*)(_wsKey.c_str() + 16), false, _wsKey.size() - 17);
const wchar_t* pTransform;
CStaticResource* pResource; CStaticResource* pResource;
for (int nIndex = m_vResourcesStack.size() - 1; nIndex >= 0; nIndex--) for (int nIndex = m_vResourcesStack.size() - 1; nIndex >= 0; nIndex--)
{ {
pResource = m_vResourcesStack.at(nIndex).pResource; pResource = m_vResourcesStack.at(nIndex).pResource;
pTransform = pResource->GetTransform(wsKey); if (pResource->GetTransform(wsKey, wsTransform))
if (NULL != pTransform)
{
wsTransform.create(pTransform, true);
return; return;
} }
} }
}
} }
\ No newline at end of file
XpsFile/XpsLib/Page.cpp
View file @ 23e5e6d7
...@@ -258,6 +258,12 @@ namespace XPS ...@@ -258,6 +258,12 @@ namespace XPS
ReadTransform(oReader, wsTransform); ReadTransform(oReader, wsTransform);
bTransform = TransformToRenderer(wsTransform.c_str(), pState); bTransform = TransformToRenderer(wsTransform.c_str(), pState);
} }
else if (wsNodeName == L"Canvas.Clip" && !bClip)
{
CWString wsClip;
ReadClip(oReader, wsClip);
bClip = ClipToRenderer(wsClip.c_str(), pState);
}
else if (wsNodeName == L"Path") else if (wsNodeName == L"Path")
{ {
DrawPath(oReader, pRenderer, pState); DrawPath(oReader, pRenderer, pState);
...@@ -499,22 +505,6 @@ namespace XPS ...@@ -499,22 +505,6 @@ namespace XPS
} }
oReader.MoveToElement(); oReader.MoveToElement();
if (!oReader.IsEmptyNode())
{
std::wstring wsNodeName;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
wsNodeName = RemoveNamespace(wsNodeName);
if (L"Glyphs.RenderTransform" == wsNodeName)
{
ReadTransform(oReader, wsTransform);
}
}
}
CBrush* pBrush = NULL; CBrush* pBrush = NULL;
bool bDeleteBrush = false; bool bDeleteBrush = false;
if (!wsFill.empty()) if (!wsFill.empty())
...@@ -531,6 +521,25 @@ namespace XPS ...@@ -531,6 +521,25 @@ namespace XPS
} }
} }
if (!oReader.IsEmptyNode())
{
CWString wsNodeName;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
if (wsNodeName == L"Glyphs.RenderTransform")
{
ReadTransform(oReader, wsTransform);
}
else if (wsNodeName == L"Glyphs.Fill" && !pBrush)
{
pBrush = ReadBrush(oReader, pState->GetCurrentOpacity());
bDeleteBrush = true;
}
}
}
if (!pBrush || !pBrush->SetToRenderer(pRenderer)) if (!pBrush || !pBrush->SetToRenderer(pRenderer))
{ {
if (bDeleteBrush) if (bDeleteBrush)
...@@ -725,12 +734,6 @@ namespace XPS ...@@ -725,12 +734,6 @@ namespace XPS
if (bOpacity) if (bOpacity)
pState->PopOpacity(); pState->PopOpacity();
} }
CWString Page::ReadClip(XmlUtils::CXmlLiteReader& oReader)
{
CWString wsClip;
// TODO: Реализовать чтение Clip
return wsClip;
}
void Page::DrawPath(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState) void Page::DrawPath(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState)
{ {
bool bTransform = false, bClip = false, bOpacity = false; bool bTransform = false, bClip = false, bOpacity = false;
...@@ -887,7 +890,7 @@ namespace XPS ...@@ -887,7 +890,7 @@ namespace XPS
} }
else if (wsNodeName == L"Path.Clip") else if (wsNodeName == L"Path.Clip")
{ {
wsClip = ReadClip(oReader); ReadClip(oReader, wsClip);
} }
else if (wsNodeName == L"Path.Fill" && !pBrush) else if (wsNodeName == L"Path.Fill" && !pBrush)
{ {
...@@ -964,13 +967,14 @@ namespace XPS ...@@ -964,13 +967,14 @@ namespace XPS
if (!wsPathTransform.empty()) if (!wsPathTransform.empty())
bPathTransform = TransformToRenderer(wsPathTransform.c_str(), pState); bPathTransform = TransformToRenderer(wsPathTransform.c_str(), pState);
bool bWindingFillMode = VmlToRenderer(wsPathData.c_str(), pRenderer); bool bWindingFillMode = VmlToRenderer(wsPathData, pRenderer);
int nMode = bStroke ? c_nStroke : 0; int nMode = bStroke ? c_nStroke : 0;
if (bFill) if (bFill)
nMode |= (bWindingFillMode ? c_nWindingFillMode : c_nEvenOddFillMode); nMode |= (bWindingFillMode ? c_nWindingFillMode : c_nEvenOddFillMode);
pRenderer->DrawPath(nMode); pRenderer->DrawPath(nMode);
pRenderer->EndCommand(c_nPathType); pRenderer->EndCommand(c_nPathType);
pRenderer->PathCommandEnd(); pRenderer->PathCommandEnd();
......
XpsFile/XpsLib/Page.h
View file @ 23e5e6d7
...@@ -35,9 +35,6 @@ namespace XPS ...@@ -35,9 +35,6 @@ namespace XPS
bool ClipToRenderer (const wchar_t* wsString, CContextState* pState); bool ClipToRenderer (const wchar_t* wsString, CContextState* pState);
bool TransformToRenderer(const wchar_t* wsString, CContextState* pState); bool TransformToRenderer(const wchar_t* wsString, CContextState* pState);
CWString ReadClip (XmlUtils::CXmlLiteReader& oReader);
private: private:
std::wstring m_wsPagePath; std::wstring m_wsPagePath;
......
XpsFile/XpsLib/StaticResources.cpp
View file @ 23e5e6d7
...@@ -35,13 +35,16 @@ namespace XPS ...@@ -35,13 +35,16 @@ namespace XPS
CStaticResource::~CStaticResource() CStaticResource::~CStaticResource()
{ {
} }
const wchar_t* CStaticResource::GetFigure(CWString& wsKey) bool CStaticResource::GetFigure(CWString& wsKey, CWString& wsData)
{ {
std::map<CWString, CWString>::iterator oIter = m_mFigures.find(wsKey); std::map<CWString, CWString>::iterator oIter = m_mFigures.find(wsKey);
if (oIter != m_mFigures.end()) if (oIter != m_mFigures.end())
return oIter->second.c_str(); {
wsData = oIter->second;
return true;
}
return NULL; return false;
} }
CBrush* CStaticResource::GetBrush(CWString& wsKey) CBrush* CStaticResource::GetBrush(CWString& wsKey)
{ {
...@@ -51,13 +54,16 @@ namespace XPS ...@@ -51,13 +54,16 @@ namespace XPS
return NULL; return NULL;
} }
const wchar_t* CStaticResource::GetTransform(CWString& wsKey) bool CStaticResource::GetTransform(CWString& wsKey, CWString& wsTransform)
{ {
std::map<CWString, CWString>::iterator oIter = m_mTransforms.find(wsKey); std::map<CWString, CWString>::iterator oIter = m_mTransforms.find(wsKey);
if (oIter != m_mTransforms.end()) if (oIter != m_mTransforms.end())
return oIter->second.c_str(); {
wsTransform = oIter->second;
return true;
}
return NULL; return false;
} }
void CStaticResource::Parse(XmlUtils::CXmlLiteReader& oReader) void CStaticResource::Parse(XmlUtils::CXmlLiteReader& oReader)
{ {
...@@ -69,26 +75,8 @@ namespace XPS ...@@ -69,26 +75,8 @@ namespace XPS
wsNodeName = oReader.GetName(); wsNodeName = oReader.GetName();
if (wsNodeName == L"PathGeometry") if (wsNodeName == L"PathGeometry")
{ {
CWString wsKey, wsValue; CWString wsKey, wsValue, wsTrasform;
ReadPathGeometry(oReader, wsValue, wsTrasform, &wsKey);
if (oReader.MoveToFirstAttribute())
{
wsAttrName = oReader.GetName();
while (!wsAttrName.empty())
{
if (wsAttrName == L"x:Key")
wsKey.create(oReader.GetText(), true);
else if (wsAttrName == L"Figures")
wsValue.create(oReader.GetText(), true);
if (!oReader.MoveToNextAttribute())
break;
wsAttrName = oReader.GetName();
}
oReader.MoveToElement();
}
if (!wsKey.empty() && !wsValue.empty()) if (!wsKey.empty() && !wsValue.empty())
AddFigure(wsKey, wsValue); AddFigure(wsKey, wsValue);
......
XpsFile/XpsLib/StaticResources.h
View file @ 23e5e6d7
...@@ -17,9 +17,9 @@ namespace XPS ...@@ -17,9 +17,9 @@ namespace XPS
CStaticResource(const wchar_t* wsPath); CStaticResource(const wchar_t* wsPath);
CStaticResource(XmlUtils::CXmlLiteReader& oReader); CStaticResource(XmlUtils::CXmlLiteReader& oReader);
~CStaticResource(); ~CStaticResource();
const wchar_t* GetFigure(CWString& wsKey); bool GetFigure(CWString& wsKey, CWString& wsFigure);
CBrush* GetBrush(CWString& wsKey); CBrush* GetBrush(CWString& wsKey);
const wchar_t* GetTransform(CWString& wsKey); bool GetTransform(CWString& wsKey, CWString& wsTransform);
private: private:
......
XpsFile/XpsLib/Utils.cpp
View file @ 23e5e6d7
...@@ -888,12 +888,13 @@ namespace XPS ...@@ -888,12 +888,13 @@ namespace XPS
oReader.MoveToElement(); oReader.MoveToElement();
} }
bool VmlToRenderer(const wchar_t* wsString, IRenderer* pRenderer) bool VmlToRenderer(const CWString& _wsString, IRenderer* pRenderer)
{ {
bool bWinding = false; bool bWinding = false;
const wchar_t* wsString = _wsString.c_str();
int nLen = _wsString.size();
int nPos = 0; int nPos = 0;
int nLen = wcslen(wsString);
double dCurX = 0.0, dCurY = 0.0; double dCurX = 0.0, dCurY = 0.0;
double dCpX = 0.0, dCpY = 0.0; double dCpX = 0.0, dCpY = 0.0;
...@@ -1209,6 +1210,11 @@ namespace XPS ...@@ -1209,6 +1210,11 @@ namespace XPS
nIndicesPos++; nIndicesPos++;
} }
else if (oEntry.vRemainUnicodes.size() > 0)
{
nCodeUnitCount = 0;
nGlyphCount = 0;
}
if (nCodeUnitCount > 0 && nGlyphCount > 0) if (nCodeUnitCount > 0 && nGlyphCount > 0)
...@@ -1467,10 +1473,12 @@ namespace XPS ...@@ -1467,10 +1473,12 @@ namespace XPS
return; return;
if (!bEvenOdd) if (!bEvenOdd)
wsData = L"F 1"; wsData += L"F 1";
std::wstring wsStartPoint; std::wstring wsStartPoint;
std::wstring wsIsClosed;
ReadAttribute(oReader, L"StartPoint", wsStartPoint); ReadAttribute(oReader, L"StartPoint", wsStartPoint);
ReadAttribute(oReader, L"IsClosed", wsIsClosed);
wsData += L" M " + wsStartPoint; wsData += L" M " + wsStartPoint;
std::wstring wsNodeName; std::wstring wsNodeName;
...@@ -1537,12 +1545,10 @@ namespace XPS ...@@ -1537,12 +1545,10 @@ namespace XPS
} }
} }
std::wstring wsClosed; if (GetBool(wsIsClosed))
ReadAttribute(oReader, L"IsClosed", wsClosed);
if (GetBool(wsClosed))
wsData += L" Z "; wsData += L" Z ";
} }
void ReadGradientStops(XmlUtils::CXmlLiteReader& oReader, std::vector<LONG>& vColors, std::vector<double>& vPositions, const double& dOpacity) void ReadGradientStops (XmlUtils::CXmlLiteReader& oReader, std::vector<LONG>& vColors, std::vector<double>& vPositions, const double& dOpacity)
{ {
if (oReader.IsEmptyNode()) if (oReader.IsEmptyNode())
return; return;
...@@ -1586,6 +1592,20 @@ namespace XPS ...@@ -1586,6 +1592,20 @@ namespace XPS
} }
} }
} }
void ReadClip (XmlUtils::CXmlLiteReader& oReader, CWString& wsClip)
{
CWString wsNodeName;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
if (wsNodeName == L"PathGeometry")
{
CWString wsTransform;
ReadPathGeometry(oReader, wsClip, wsTransform);
}
}
}
void ReadSTPoint(const CWString& wsString, double& dX, double& dY) void ReadSTPoint(const CWString& wsString, double& dX, double& dY)
{ {
......
XpsFile/XpsLib/Utils.h
View file @ 23e5e6d7
...@@ -75,7 +75,7 @@ namespace XPS ...@@ -75,7 +75,7 @@ namespace XPS
void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, std::wstring& wsAttr); void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, std::wstring& wsAttr);
void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, CWString& wsAttr); void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, CWString& wsAttr);
bool VmlToRenderer(const wchar_t* wsString, IRenderer* pRenderer); bool VmlToRenderer(const CWString& wsString, IRenderer* pRenderer);
bool GetNextGlyph(const wchar_t* wsIndices, int& nIndicesPos, const int& nIndicesLen, unsigned short* pUtf16, int& nUtf16Pos, const int& nUtf16Len, TIndicesEntry& oEntry); bool GetNextGlyph(const wchar_t* wsIndices, int& nIndicesPos, const int& nIndicesLen, unsigned short* pUtf16, int& nUtf16Pos, const int& nUtf16Len, TIndicesEntry& oEntry);
void ReadSTPoint(const CWString& wsString, double& dX, double& dY); void ReadSTPoint(const CWString& wsString, double& dX, double& dY);
...@@ -87,6 +87,7 @@ namespace XPS ...@@ -87,6 +87,7 @@ namespace XPS
void ReadTransform (XmlUtils::CXmlLiteReader& oReader, CWString& wsTransform, CWString* pwsKey = NULL); void ReadTransform (XmlUtils::CXmlLiteReader& oReader, CWString& wsTransform, CWString* pwsKey = NULL);
void ReadPathGeometry (XmlUtils::CXmlLiteReader& oReader, CWString& wsData, CWString& wsTransform, CWString* pwsKey = NULL); void ReadPathGeometry (XmlUtils::CXmlLiteReader& oReader, CWString& wsData, CWString& wsTransform, CWString* pwsKey = NULL);
void ReadPathFigure (XmlUtils::CXmlLiteReader& oReader, std::wstring&, bool bEvenOdd); void ReadPathFigure (XmlUtils::CXmlLiteReader& oReader, std::wstring&, bool bEvenOdd);
void ReadClip (XmlUtils::CXmlLiteReader& oReader, CWString& wsClip);
void ReadGradientStops(XmlUtils::CXmlLiteReader& oReader, std::vector<LONG>& vColors, std::vector<double>& vPositions, const double& dOpacity); void ReadGradientStops(XmlUtils::CXmlLiteReader& oReader, std::vector<LONG>& vColors, std::vector<double>& vPositions, const double& dOpacity);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7