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

Merge remote-tracking branch 'origin/release/v8.1.0' into feature/pdf-shape

Browse Source 
# Conflicts:
#	DesktopEditor/graphics/pro/js/wasm/src/pdfwriter.cpp
#	PdfFile/PdfReader.cpp
#	PdfFile/SrcWriter/Document.cpp
This commit is contained in:
Svetlana Kulikova
2024-04-05 12:25:30 +03:00
parent e01aa641a0 6fdac51409
commit bfefe4d1b7
267 changed files with 25766 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PdfFile/SrcReader/RendererOutputDev.cpp
View File

@ -1608,7 +1608,7 @@ namespace PdfReader
nLen = 0;
}
}
else if (L"" != wsFileName && (pFont8bit = dynamic_cast<Gfx8BitFont*>(pFont)) && pFont8bit->getHasEncoding())
else if (L"" != wsFileName && (pFont8bit = dynamic_cast<Gfx8BitFont*>(pFont)))
{
char **ppEncoding = pFont8bit->getEncoding();
if (!ppEncoding)
@ -3945,8 +3945,8 @@ namespace PdfReader
pNewTm[1] = pTm[1] * dITextScale * pGState->getHorizScaling();
pNewTm[2] = -pTm[2] * dITextScale;
pNewTm[3] = -pTm[3] * dITextScale;
pNewTm[4] = dX;
pNewTm[5] = dY;
pNewTm[4] = dX - dOriginX;
pNewTm[5] = dY - dOriginY;
}
else
{
@ -4035,8 +4035,9 @@ namespace PdfReader
if (nRenderMode == 0 || nRenderMode == 4 || nRenderMode == 6 || (m_bDrawOnlyText && nRenderMode == 2))
{
#ifdef BUILDING_WASM_MODULE
bool bReplace = false;
std::wstring sFontPath;
#ifdef BUILDING_WASM_MODULE
m_pRenderer->get_FontPath(&sFontPath);
if (!unGid && !wsUnicodeText.empty() && !sFontPath.empty())
{
@ -4079,13 +4080,15 @@ namespace PdfReader
return;
}
m_pRenderer->put_FontPath(wsFileName);
sFontPath = wsFileName;
bReplace = true;
}
}
}
}
#endif
m_pRenderer->CommandDrawTextEx(wsUnicodeText, &unGid, unGidsCount, PDFCoordsToMM(dShiftX), PDFCoordsToMM(dShiftY), PDFCoordsToMM(dDx), PDFCoordsToMM(dDy));
if (bReplace)
m_pRenderer->put_FontPath(sFontPath);
}
if (nRenderMode == 1 || nRenderMode == 2 || nRenderMode == 5 || nRenderMode == 6)