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

Merge pull request 'Fix pdf bugs' (#640) from fix/pdf-bugs into release/v9.3.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/640
This commit is contained in:
Oleg Korshul
2026-02-04 11:26:56 +00:00
parent adcdbc164f a6183fa4cd
commit 024a5e0192
3 changed files with 104 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PdfFile/SrcWriter/Document.cpp
View File

@ -901,7 +901,10 @@ namespace PdfWriter
{
CFontEmbedded* pFont = FindFontEmbedded(wsFontPath, unIndex);
if (pFont)
{
pFont->UpdateKey(sFontKey);
return pFont;
}
pFont = new CFontEmbedded(m_pXref, this);
pFont->LoadFont(sFontKey, nType, mCodeToWidth, mCodeToUnicode, mCodeToGID);
m_vFontsEmbedded.push_back(TFontInfo(wsFontPath, unIndex, pFont));

194
PdfFile/SrcWriter/Field.cpp
View File

@ -3222,56 +3222,59 @@ namespace PdfWriter
}
// Граница
if (dBorder != 1)
if (pAnnot->HaveBC())
{
m_pStream->WriteReal(dBorder);
m_pStream->WriteStr(" w\012");
}
if (nBorderType == EBorderType::Dashed)
m_pStream->WriteStr(m_pAnnot->GetBorderDash().c_str());
m_pStream->WriteStr(pAnnot->GetBCforAP().c_str());
m_pStream->WriteStr("\012q\012");
m_pStream->WriteStr("1 0 0 1 ");
m_pStream->WriteReal(dCX);
m_pStream->WriteChar(' ');
m_pStream->WriteReal(dCY);
m_pStream->WriteStr(" cm\012");
StreamWriteCircle(m_pStream, 0, 0, dR - dBorder / 2.0);
m_pStream->WriteStr("s\012Q\012");
if (nBorderType == EBorderType::Beveled || nBorderType == EBorderType::Inset)
{
double ca = cos(45.0 / 180.0 * M_PI);
double cx = 0, cy = 0, r = dR - dBorder * 1.5;
double bezierCircle = 0.55228475 * r;
std::string sBG = pAnnot->GetBGforAP(-0.250977, true);
if (sBG.empty())
sBG = "0.749023 G";
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.501953 G" : "0 G");
else // Beveled
m_pStream->WriteStr(bN ? "1 G" : sBG.c_str());
if (dBorder != 1)
{
m_pStream->WriteReal(dBorder);
m_pStream->WriteStr(" w\012");
}
if (nBorderType == EBorderType::Dashed)
m_pStream->WriteStr(m_pAnnot->GetBorderDash().c_str());
m_pStream->WriteStr(pAnnot->GetBCforAP().c_str());
m_pStream->WriteStr("\012q\012");
StreamWriteCM(m_pStream, ca, ca, -ca, ca, dCX, dCY);
StreamWriteXYMove(m_pStream, cx + r, cy);
StreamWriteXYCurve(m_pStream, cx + r, cy + bezierCircle, cx + bezierCircle, cy + r, cx, cy + r);
StreamWriteXYCurve(m_pStream, cx - bezierCircle, cy + r, cx - r, cy + bezierCircle, cx - r, cy);
m_pStream->WriteStr("S\012Q\012");
m_pStream->WriteStr("1 0 0 1 ");
m_pStream->WriteReal(dCX);
m_pStream->WriteChar(' ');
m_pStream->WriteReal(dCY);
m_pStream->WriteStr(" cm\012");
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.75293 G" : "1 G");
else // Beveled
m_pStream->WriteStr(bN ? sBG.c_str() : "1 G");
StreamWriteCircle(m_pStream, 0, 0, dR - dBorder / 2.0);
m_pStream->WriteStr("s\012Q\012");
m_pStream->WriteStr("\012q\012");
StreamWriteCM(m_pStream, ca, ca, -ca, ca, dCX, dCY);
StreamWriteXYMove(m_pStream, cx - r, cy);
StreamWriteXYCurve(m_pStream, cx - r, cy - bezierCircle, cx - bezierCircle, cy - r, cx, cy - r);
StreamWriteXYCurve(m_pStream, cx + bezierCircle, cy - r, cx + r, cy - bezierCircle, cx + r, cy);
m_pStream->WriteStr("S\012Q\012");
if (nBorderType == EBorderType::Beveled || nBorderType == EBorderType::Inset)
{
double ca = cos(45.0 / 180.0 * M_PI);
double cx = 0, cy = 0, r = dR - dBorder * 1.5;
double bezierCircle = 0.55228475 * r;
std::string sBG = pAnnot->GetBGforAP(-0.250977, true);
if (sBG.empty())
sBG = "0.749023 G";
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.501953 G" : "0 G");
else // Beveled
m_pStream->WriteStr(bN ? "1 G" : sBG.c_str());
m_pStream->WriteStr("\012q\012");
StreamWriteCM(m_pStream, ca, ca, -ca, ca, dCX, dCY);
StreamWriteXYMove(m_pStream, cx + r, cy);
StreamWriteXYCurve(m_pStream, cx + r, cy + bezierCircle, cx + bezierCircle, cy + r, cx, cy + r);
StreamWriteXYCurve(m_pStream, cx - bezierCircle, cy + r, cx - r, cy + bezierCircle, cx - r, cy);
m_pStream->WriteStr("S\012Q\012");
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.75293 G" : "1 G");
else // Beveled
m_pStream->WriteStr(bN ? sBG.c_str() : "1 G");
m_pStream->WriteStr("\012q\012");
StreamWriteCM(m_pStream, ca, ca, -ca, ca, dCX, dCY);
StreamWriteXYMove(m_pStream, cx - r, cy);
StreamWriteXYCurve(m_pStream, cx - r, cy - bezierCircle, cx - bezierCircle, cy - r, cx, cy - r);
StreamWriteXYCurve(m_pStream, cx + bezierCircle, cy - r, cx + r, cy - bezierCircle, cx + r, cy);
m_pStream->WriteStr("S\012Q\012");
}
}
// Установлен
@ -3328,60 +3331,63 @@ namespace PdfWriter
}
// Граница
if (nBorderType == EBorderType::Beveled || nBorderType == EBorderType::Inset)
if (pAnnot->HaveBC())
{
std::string sBG = pAnnot->GetBGforAP(-0.250977);
if (sBG.empty())
sBG = "0.749023 g";
if (nBorderType == EBorderType::Beveled || nBorderType == EBorderType::Inset)
{
std::string sBG = pAnnot->GetBGforAP(-0.250977);
if (sBG.empty())
sBG = "0.749023 g";
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.501953 g" : "0 g");
else // Beveled
m_pStream->WriteStr(bN ? "1 g" : sBG.c_str());
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.501953 g" : "0 g");
else // Beveled
m_pStream->WriteStr(bN ? "1 g" : sBG.c_str());
m_pStream->WriteStr("\012");
StreamWriteXYMove(m_pStream, dBorder, dBorder);
StreamWriteXYLine(m_pStream, dBorder, dH - dBorder);
StreamWriteXYLine(m_pStream, dW - dBorder, dH - dBorder);
StreamWriteXYLine(m_pStream, dW - dBorder * 2.0, dH - dBorder * 2.0);
StreamWriteXYLine(m_pStream, dBorder * 2.0, dH - dBorder * 2.0);
StreamWriteXYLine(m_pStream, dBorder * 2.0, dBorder * 2.0);
m_pStream->WriteStr("f\012");
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.75293 g" : "1 g");
else // Beveled
m_pStream->WriteStr(bN ? sBG.c_str() : "1 g");
m_pStream->WriteStr("\012");
StreamWriteXYMove(m_pStream, dW - dBorder, dH - dBorder);
StreamWriteXYLine(m_pStream, dW - dBorder, dBorder);
StreamWriteXYLine(m_pStream, dBorder, dBorder);
StreamWriteXYLine(m_pStream, dBorder * 2.0, dBorder * 2.0);
StreamWriteXYLine(m_pStream, dW - dBorder * 2.0, dBorder * 2.0);
StreamWriteXYLine(m_pStream, dW - dBorder * 2.0, dH - dBorder * 2.0);
m_pStream->WriteStr("f\012");
}
if (dBorder != 1)
{
m_pStream->WriteReal(dBorder);
m_pStream->WriteStr(" w\012");
}
if (nBorderType == EBorderType::Dashed)
m_pStream->WriteStr(m_pAnnot->GetBorderDash().c_str());
m_pStream->WriteStr(pAnnot->GetBCforAP().c_str());
m_pStream->WriteStr("\012");
StreamWriteXYMove(m_pStream, dBorder, dBorder);
StreamWriteXYLine(m_pStream, dBorder, dH - dBorder);
StreamWriteXYLine(m_pStream, dW - dBorder, dH - dBorder);
StreamWriteXYLine(m_pStream, dW - dBorder * 2.0, dH - dBorder * 2.0);
StreamWriteXYLine(m_pStream, dBorder * 2.0, dH - dBorder * 2.0);
StreamWriteXYLine(m_pStream, dBorder * 2.0, dBorder * 2.0);
m_pStream->WriteStr("f\012");
if (nBorderType == EBorderType::Inset)
m_pStream->WriteStr(bN ? "0.75293 g" : "1 g");
else // Beveled
m_pStream->WriteStr(bN ? sBG.c_str() : "1 g");
m_pStream->WriteStr("\012");
StreamWriteXYMove(m_pStream, dW - dBorder, dH - dBorder);
StreamWriteXYLine(m_pStream, dW - dBorder, dBorder);
StreamWriteXYLine(m_pStream, dBorder, dBorder);
StreamWriteXYLine(m_pStream, dBorder * 2.0, dBorder * 2.0);
StreamWriteXYLine(m_pStream, dW - dBorder * 2.0, dBorder * 2.0);
StreamWriteXYLine(m_pStream, dW - dBorder * 2.0, dH - dBorder * 2.0);
m_pStream->WriteStr("f\012");
if (nBorderType == EBorderType::Underline)
{
StreamWriteXYMove(m_pStream, 0, dBorder / 2.0);
StreamWriteXYLine(m_pStream, dW, dBorder / 2.0);
}
else
StreamWriteRect(m_pStream, dBorder / 2.0, dBorder / 2.0, dW - dBorder, dH - dBorder);
m_pStream->WriteStr("s\012Q\012");
}
if (dBorder != 1)
{
m_pStream->WriteReal(dBorder);
m_pStream->WriteStr(" w\012");
}
if (nBorderType == EBorderType::Dashed)
m_pStream->WriteStr(m_pAnnot->GetBorderDash().c_str());
m_pStream->WriteStr(pAnnot->GetBCforAP().c_str());
m_pStream->WriteStr("\012");
if (nBorderType == EBorderType::Underline)
{
StreamWriteXYMove(m_pStream, 0, dBorder / 2.0);
StreamWriteXYLine(m_pStream, dW, dBorder / 2.0);
}
else
StreamWriteRect(m_pStream, dBorder / 2.0, dBorder / 2.0, dW - dBorder, dH - dBorder);
m_pStream->WriteStr("s\012Q\012");
// Установлен
if (!bSet)
return;

1
PdfFile/SrcWriter/Font14.h
View File

@ -71,6 +71,7 @@ namespace PdfWriter
unsigned int EncodeUnicode(const unsigned int& unGID, const unsigned int& unUnicode);
unsigned int EncodeGID(const unsigned int& unGID);
const char* GetFontKey() const { return m_sFontKey.c_str(); }
void UpdateKey(const std::string& sFontKey) { m_sFontKey = sFontKey; }
private:
std::string m_sFontKey;