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

Redact stroke path

Browse Source
This commit is contained in:
Svetlana Kulikova
2025-08-22 14:56:44 +03:00
parent 3cf3a3e098
commit e32aea2138
9 changed files with 363 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1006,9 +1006,9 @@ void Gfx::opSetExtGState(Object args[], int numArgs) {
printf("\n");
}
if (out->useExtGState())
if (out->useNameOp())
{
out->setExtGState(state, &obj1, args[0].getName());
out->setExtGState(args[0].getName());
obj1.free();
return;
}
@ -1453,6 +1453,11 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
" in uncolored Type 3 char or tiling pattern");
return;
}
if (out->useNameOp())
{
out->setFillColorSpace(args[0].getName());
return;
}
state->setFillPattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
@ -1465,7 +1470,7 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
obj.free();
if (colorSpace) {
state->setFillColorSpace(colorSpace);
out->updateFillColorSpace(state);
out->updateFillColorSpace(state);
colorSpace->getDefaultColor(&color);
state->setFillColor(&color);
out->updateFillColor(state);
@ -1562,6 +1567,11 @@ void Gfx::opSetFillColorN(Object args[], int numArgs) {
" in uncolored Type 3 char or tiling pattern");
return;
}
if (out->useNameOp())
{
out->setFillColorN(args[numArgs-1].getName());
return;
}
if (state->getFillColorSpace()->getMode() == csPattern) {
if (numArgs == 0 || !args[numArgs-1].isName()) {
error(errSyntaxError, getPos(),
@ -1588,7 +1598,6 @@ void Gfx::opSetFillColorN(Object args[], int numArgs) {
))) {
state->setFillPattern(pattern);
}
} else {
if (numArgs != state->getFillColorSpace()->getNComps()) {
error(errSyntaxError, getPos(),
@ -4082,7 +4091,10 @@ void Gfx::opXObject(Object args[], int numArgs) {
if (obj2.isName("Image")) {
if (out->needNonText()) {
res->lookupXObjectNF(name, &refObj);
doImage(&refObj, obj1.getStream(), gFalse);
if (out->useNameOp() && refObj.isRef())
out->drawImage(state, refObj.getRef(), name);
else
doImage(&refObj, obj1.getStream(), gFalse);
refObj.free();
}
} else if (obj2.isName("Form")) {

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

@ -190,8 +190,10 @@ public:
virtual GBool beginMarkedContent(GfxState *state, GString *s) { return gFalse; }
virtual GBool beginMCOShapes(GfxState *state, GString *s, Object *ref) { return gFalse; }
virtual void endMarkedContent(GfxState *state) {}
virtual GBool useExtGState() { return gFalse; }
virtual void setExtGState(GfxState *state, Object *obj, const char* name) {}
virtual GBool useNameOp() { return gFalse; }
virtual void setExtGState(const char* name) {}
virtual void setFillColorSpace(const char* name) {}
virtual void setFillColorN(const char* name) {}
//----- image drawing
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
@ -231,6 +233,7 @@ public:
//----- form XObjects
virtual void drawForm(GfxState *state, Ref id, const char *name = nullptr) {}
virtual void drawImage(GfxState *pGState, Ref id, const char* name = nullptr) {}
//----- PostScript XObjects
virtual void psXObject(Stream *psStream, Stream *level1Stream) {}