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

Fix setFillColorN

Browse Source
This commit is contained in:
Svetlana Kulikova
2025-09-30 12:22:51 +03:00
parent c622fa54fc
commit c3d2761c10
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PdfFile/PdfWriter.cpp
View File

@ -168,6 +168,8 @@ CPdfWriter::CPdfWriter(NSFonts::IApplicationFonts* pAppFonts, bool isPDFA, IRend
m_pRenderer = pRenderer;
m_bNeedAddHelvetica = true;
m_wsTempDirectory = wsTempDirectory;
m_pShading = NULL;
m_pShadingExtGrState = NULL;
m_pDocument = new PdfWriter::CDocument();

52
PdfFile/SrcWriter/RedactOutputDev.cpp
View File

@ -527,19 +527,29 @@ void RedactOutputDev::setExtGState(const char* name)
{
if (m_sStates.empty())
return;
m_sStates.back().m_arrOp.push_back(std::make_pair(name, "gs"));
m_sStates.back().m_arrOp.push_back(std::make_pair("/" + std::string(name), "gs"));
}
void RedactOutputDev::setFillColorSpace(const char* name)
{
if (m_sStates.empty())
return;
m_sStates.back().m_arrOp.push_back(std::make_pair(name, "cs"));
m_sStates.back().m_arrOp.push_back(std::make_pair("/" + std::string(name), "cs"));
}
void RedactOutputDev::setFillColorN(const char* name)
void RedactOutputDev::setFillColorN(Object* args, int numArgs)
{
if (m_sStates.empty())
return;
m_sStates.back().m_arrOp.push_back(std::make_pair(name, "scn"));
std::string sOp;
for (int i = 0; i < numArgs; ++i)
{
if (args[i].isName())
sOp += ("/" + std::string(args[i].getName()) + " ");
else if (args[i].isInt())
sOp += (std::to_string(args[i].getInt()) + " ");
else if (args[i].isReal())
sOp += (std::to_string(args[i].getReal()) + " ");
}
m_sStates.back().m_arrOp.push_back(std::make_pair(sOp, "scn"));
}
//----- image drawing
void RedactOutputDev::drawImageMask(GfxState *pGState, Object *pRef, Stream *pStream, int nWidth, int nHeight, GBool bInvert, GBool bInlineImage, GBool interpolate)
@ -632,7 +642,7 @@ void RedactOutputDev::drawForm(GfxState *pGState, Ref id, const char* name)
{
for (int j = 0; j < m_sStates[i].m_arrOp.size(); ++j)
{
pStream->WriteEscapeName(m_sStates[i].m_arrOp[j].first.c_str());
pStream->WriteStr(m_sStates[i].m_arrOp[j].first.c_str());
pStream->WriteChar(' ');
pStream->WriteStr(m_sStates[i].m_arrOp[j].second.c_str());
pStream->WriteStr("\012");
@ -697,6 +707,20 @@ void RedactOutputDev::drawImage(GfxState *pGState, Ref id, const char* name)
Transform(m_arrMatrix, dXmin, dYmin, &dXmin, &dYmin);
Transform(m_arrMatrix, dXmax, dYmax, &dXmax, &dYmax);
m_pPage->GrSave();
UpdateTransform();
CStream* pStream = m_pPage->GetStream();
for (int i = 0; i < m_sStates.size(); ++i)
{
for (int j = 0; j < m_sStates[i].m_arrOp.size(); ++j)
{
pStream->WriteStr(m_sStates[i].m_arrOp[j].first.c_str());
pStream->WriteChar(' ');
pStream->WriteStr(m_sStates[i].m_arrOp[j].second.c_str());
pStream->WriteStr("\012");
}
}
for (int i = 0; i < m_arrQuadPoints.size(); i += 4)
{
double xMin = m_arrQuadPoints[i + 0];
@ -705,23 +729,13 @@ void RedactOutputDev::drawImage(GfxState *pGState, Ref id, const char* name)
double yMax = m_arrQuadPoints[i + 3];
if (!(dXmax < xMin || dXmin > xMax || dYmax < yMin || dYmin > yMax))
{
m_pPage->GrRestore();
return;
}
}
oImage.free();
m_pPage->GrSave();
UpdateTransform();
CStream* pStream = m_pPage->GetStream();
for (int i = 0; i < m_sStates.size(); ++i)
{
for (int j = 0; j < m_sStates[i].m_arrOp.size(); ++j)
{
pStream->WriteEscapeName(m_sStates[i].m_arrOp[j].first.c_str());
pStream->WriteChar(' ');
pStream->WriteStr(m_sStates[i].m_arrOp[j].second.c_str());
pStream->WriteStr("\012");
}
}
m_pPage->ExecuteXObject(name);
m_pPage->GrRestore();
}
@ -1400,7 +1414,7 @@ void RedactOutputDev::DrawPath(const LONG& lType)
{
for (int j = 0; j < m_sStates[i].m_arrOp.size(); ++j)
{
pStream->WriteEscapeName(m_sStates[i].m_arrOp[j].first.c_str());
pStream->WriteStr(m_sStates[i].m_arrOp[j].first.c_str());
pStream->WriteChar(' ');
pStream->WriteStr(m_sStates[i].m_arrOp[j].second.c_str());
pStream->WriteStr("\012");

2
PdfFile/SrcWriter/RedactOutputDev.h
View File

@ -156,7 +156,7 @@ namespace PdfWriter
virtual GBool useNameOp() override;
virtual void setExtGState(const char* name) override;
virtual void setFillColorSpace(const char* name) override;
virtual void setFillColorN(const char* name) override;
virtual void setFillColorN(Object* args, int numArgs) override;
//----- image drawing
virtual void drawImageMask(GfxState *pGState, Object *pRef, Stream *pStream, int nWidth, int nHeight, GBool bInvert, GBool bInlineImage, GBool interpolate) override;
virtual void setSoftMaskFromImageMask(GfxState *pGState, Object *pRef, Stream *pStream, int nWidth, int nHeight, GBool bInvert, GBool bInlineImage, GBool interpolate) override;

2
PdfFile/lib/xpdf/Gfx.cc
View File

@ -1569,7 +1569,7 @@ void Gfx::opSetFillColorN(Object args[], int numArgs) {
}
if (out->useNameOp())
{
out->setFillColorN(args[numArgs-1].getName());
out->setFillColorN(args, numArgs);
return;
}
if (state->getFillColorSpace()->getMode() == csPattern) {

2
PdfFile/lib/xpdf/OutputDev.h
View File

@ -193,7 +193,7 @@ public:
virtual GBool useNameOp() { return gFalse; }
virtual void setExtGState(const char* name) {}
virtual void setFillColorSpace(const char* name) {}
virtual void setFillColorN(const char* name) {}
virtual void setFillColorN(Object* args, int numArgs) {}
//----- image drawing
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,