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

Merge remote-tracking branch 'origin/hotfix/v5.1.5' into develop

Browse Source
This commit is contained in:
ElenaSubbotina
2018-05-30 13:21:14 +03:00
parent 111ceff368 b952692225
commit c14a21b2da
5 changed files with 166 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h
View File

@ -515,6 +515,9 @@ namespace MetaFile
else //if (WINDING == unFillMode)
unClipMode |= c_nClipRegionTypeWinding;
if (RGN_COPY == unMode)
ResetClip();
m_pRenderer->put_ClipMode(unClipMode);
m_pRenderer->BeginCommand(c_nClipType);
m_pRenderer->BeginCommand(c_nPathType);

2
DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
View File

@ -232,7 +232,7 @@ static const struct ActionNamesEmf
//-----------------------------------------------------------
// 2.3.2 Clipping
//-----------------------------------------------------------
case EMR_EXCLUDECLIPRECT: Read_EMR_EXCLUDECLIPRECT(); break;
case EMR_EXCLUDECLIPRECT: Read_EMR_EXCLUDECLIPRECT(); break;
case EMR_EXTSELECTCLIPRGN: Read_EMR_EXTSELECTCLIPRGN(); break;
case EMR_INTERSECTCLIPRECT: Read_EMR_INTERSECTCLIPRECT(); break;
case EMR_SELECTCLIPPATH: Read_EMR_SELECTCLIPPATH(); break;