Skip to content

Fix incorrect lineJoin and pathfactor in get_drawings() #4955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sakamotch wants to merge 4 commits into
base: main
Choose a base branch
from
+4 −15
Open

Fix incorrect lineJoin and pathfactor in get_drawings() #4955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df8534c
Fix incorrect lineJoin and pathfactor in get_drawings()
sakamotch Mar 26, 2026
f606c6a
Use float for lineJoin to maintain backward compatibility
sakamotch Mar 26, 2026
f0edd28
Use determinant-based pathfactor and remove src_classic changes
sakamotch Mar 26, 2026
3cf53a9
Revert src_classic/helper-devices.i changes
sakamotch Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23194,11 +23194,7 @@ def jm_lineart_stroke_path( dev, ctx, path, stroke, ctm, colorspace, color, alph
#log(f'{dev.pathdict=} {dev.clips=}')
try:
assert isinstance( ctm, mupdf.fz_matrix)
dev.pathfactor = 1
if ctm.a != 0 and abs(ctm.a) == abs(ctm.d):
dev.pathfactor = abs(ctm.a)
elif ctm.b != 0 and abs(ctm.b) == abs(ctm.c):
dev.pathfactor = abs(ctm.b)
dev.pathfactor = math.sqrt(abs(ctm.a * ctm.d - ctm.b * ctm.c))
dev.ctm = mupdf.FzMatrix( ctm) # fz_concat(ctm, dev_ptm);
dev.path_type = trace_device_STROKE_PATH

Expand All @@ -23214,7 +23210,7 @@ def jm_lineart_stroke_path( dev, ctx, path, stroke, ctm, colorspace, color, alph
stroke.dash_cap,
stroke.end_cap,
)
dev.pathdict[ 'lineJoin'] = dev.pathfactor * stroke.linejoin
dev.pathdict[ 'lineJoin'] = float(stroke.linejoin)
if 'closePath' not in dev.pathdict:
#log('setting dev.pathdict["closePath"] to false')
dev.pathdict['closePath'] = False
Expand Down
11 changes: 2 additions & 9 deletions src/extra.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2719,14 +2719,7 @@ jm_lineart_stroke_path(fz_context *ctx, fz_device *dev_, const fz_path *path,
jm_lineart_device *dev = (jm_lineart_device *)dev_;
//printf("extra.jm_lineart_stroke_path(): dev->seqno=%zi\n", dev->seqno);
int i;
dev->pathfactor = 1;
if (ctm.a != 0 && fz_abs(ctm.a) == fz_abs(ctm.d)) {
dev->pathfactor = fz_abs(ctm.a);
} else {
if (ctm.b != 0 && fz_abs(ctm.b) == fz_abs(ctm.c)) {
dev->pathfactor = fz_abs(ctm.b);
}
}
dev->pathfactor = sqrtf(fabsf(ctm.a * ctm.d - ctm.b * ctm.c));
dev->ctm = ctm; // fz_concat(ctm, trace_device_ptm);
dev->path_type = STROKE_PATH;

Expand All @@ -2739,7 +2732,7 @@ jm_lineart_stroke_path(fz_context *ctx, fz_device *dev_, const fz_path *path,
DICT_SETITEMSTR_DROP(dev->pathdict, "color", jm_lineart_color(colorspace, color));
DICT_SETITEM_DROP(dev->pathdict, dictkey_width, Py_BuildValue("f", dev->pathfactor * stroke->linewidth));
DICT_SETITEMSTR_DROP(dev->pathdict, "lineCap", Py_BuildValue("iii", stroke->start_cap, stroke->dash_cap, stroke->end_cap));
DICT_SETITEMSTR_DROP(dev->pathdict, "lineJoin", Py_BuildValue("f", dev->pathfactor * stroke->linejoin));
DICT_SETITEMSTR_DROP(dev->pathdict, "lineJoin", Py_BuildValue("f", (float)stroke->linejoin));
if (!PyDict_GetItemString(dev->pathdict, "closePath")) {
DICT_SETITEMSTR_DROP(dev->pathdict, "closePath", JM_BOOL(0));
}
Expand Down
Loading