pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 71493

Browse Source 
Also fix bug 57854, 55429
This commit is contained in:
Svetlana Kulikova
2025-01-13 17:27:54 +03:00
parent a7774a6bc3
commit a9d8cbbc57
8 changed files with 270 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PdfFile/SrcReader/RendererOutputDev.cpp
View File

@ -2173,7 +2173,8 @@ namespace PdfReader
if (!m_sStates.back().pClip)
m_sStates.back().pClip = new GfxClip();
m_sStates.back().pClip->AddPath(pGState->getPath(), pGState->getCTM(), false);
int nClipFlag = c_nClipRegionIntersect | c_nClipRegionTypeWinding;
m_sStates.back().pClip->AddPath(pGState->getPath(), pGState->getCTM(), nClipFlag);
AddClip(pGState, &m_sStates.back(), m_sStates.back().pClip->GetPathNum() - 1);
}
void RendererOutputDev::eoClip(GfxState* pGState)
@ -2183,7 +2184,8 @@ namespace PdfReader
if (!m_sStates.back().pClip)
m_sStates.back().pClip = new GfxClip();
m_sStates.back().pClip->AddPath(pGState->getPath(), pGState->getCTM(), true);
int nClipFlag = c_nClipRegionIntersect | c_nClipRegionTypeEvenOdd;
m_sStates.back().pClip->AddPath(pGState->getPath(), pGState->getCTM(), nClipFlag);
AddClip(pGState, &m_sStates.back(), m_sStates.back().pClip->GetPathNum() - 1);
}
void RendererOutputDev::clipToStrokePath(GfxState* pGState)
@ -2193,7 +2195,8 @@ namespace PdfReader
if (!m_sStates.back().pClip)
m_sStates.back().pClip = new GfxClip();
m_sStates.back().pClip->AddPath(pGState->getPath(), pGState->getCTM(), false);
int nClipFlag = c_nClipRegionIntersect | c_nClipRegionTypeWinding | c_nClipToStrokePath;
m_sStates.back().pClip->AddPath(pGState->getPath(), pGState->getCTM(), nClipFlag);
AddClip(pGState, &m_sStates.back(), m_sStates.back().pClip->GetPathNum() - 1);
}
void RendererOutputDev::clipToPath(GfxState* pGState, GfxPath* pPath, double* pMatrix, bool bEO)
@ -3496,9 +3499,7 @@ namespace PdfReader
GfxClip* pClip = pState->pClip;
GfxPath* pPath = pClip->GetPath(nIndex);
bool bFlag = pClip->GetClipEo(nIndex);
int nClipFlag = bFlag ? c_nClipRegionTypeEvenOdd : c_nClipRegionTypeWinding;
nClipFlag |= c_nClipRegionIntersect;
int nClipFlag = pClip->GetClipFlag(nIndex);;
m_pRenderer->BeginCommand(c_nClipType);
m_pRenderer->put_ClipMode(nClipFlag);