Skip to content

PNG cache ignored --resolution, and a multi-page cache hit crashed #23

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

Merged
set-soft merged 3 commits into from
Sep 21, 2026
Merged

PNG cache ignored --resolution, and a multi-page cache hit crashed #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c100ed2
[Fixed] Multi-page PNG cache tested the wrong file's timestamp
Sep 19, 2026
69cce8b
[Fixed] PNG cache ignored the resolution
Sep 19, 2026
106b9ed
Merge branch 'master' into fix-png-cache-resolution
set-soft Sep 21, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Fixed
* Crash instead of a cache hit when only the multi-page PNGs were cached
* The PNG cache ignored --resolution, so a cache populated at one resolution was
reused at another and the requested resolution was silently discarded
* Layers cache was written with `\r\r\n` row endings on Windows, so the second diff of any
board failed with an `IndexError` in `load_cached_layers`

Expand Down
18 changes: 11 additions & 7 deletions kicad-diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,14 +425,18 @@ def run_command(command):
def pdf2png(base_name, blank=False, ref=None):
source = base_name+'.pdf' if not blank else ref+'.pdf'
source_mtime = getmtime(source) if isfile(source) else 0
dest1 = base_name+'.png'
destm = base_name+'-0.png'
# The PNGs are rasterized at `resolution`, while the PDFs they come from are vector and
# resolution independent. Tagging only the PNG names lets one plot serve every resolution,
# and keeps caches made at different resolutions from being reused for each other.
tag = '.r{}'.format(resolution)
dest1 = base_name+tag+'.png'
destm = base_name+tag+'-0.png'
if isfile(dest1) and getmtime(dest1) > source_mtime:
logger.debug(source+" already converted to PNG")
return [dest1]
if isfile(destm) and getmtime(dest1) > source_mtime:
if isfile(destm) and getmtime(destm) > source_mtime:
logger.debug(source+" already converted to PNG")
return sorted(glob(base_name+'-*.png'))
return sorted(glob(base_name+tag+'-*.png'))
if isfile(source):
if use_poppler:
cmd = 'cat "{}" | pdftoppm -r {} -gray - | {} - "{}"'.format(source, resolution, CONVERT, dest1)
Expand All @@ -441,21 +445,21 @@ def pdf2png(base_name, blank=False, ref=None):
'-colorspace Gray -resample {} -depth 8 "{}"'.format(resolution*2, source, resolution, dest1))
run_command(['bash', '-c', cmd])
else:
png = ref+'.png'
png = ref+tag+'.png'
assert isfile(png), png
copy2(png, dest1)
if blank:
# Create a blank file
logger.debug('Blanking '+dest1)
blanked = base_name+'_blanked.png'
blanked = base_name+tag+'_blanked.png'
cmd = (CONVERT + ' "{}" -background white -threshold 100% -negate -colorspace Gray "{}"'.format(dest1, blanked))
run_command(['bash', '-c', cmd])
remove(dest1)
dest1 = blanked
if isfile(dest1):
return [dest1]
if isfile(destm):
return sorted(glob(base_name+'-*.png'))
return sorted(glob(base_name+tag+'-*.png'))
assert False, f"Failed to convert {source} to PNG"


Expand Down
Loading