Repository navigation
Conversation
Follow-up to KnifeLemon#1440. ImageReader.Read takes an optional CancellationToken and passes it to Xcf.ReadFlattened, so the row-by-row cancellation of a GIMP merge reaches every engine that reads pictures, not only the ImageMagick converter: PDF (PdfSharp), HEIC, ICNS, upscaling, tracing, 3D and Merge images now pass their job's token. The converter's own XCF special case is gone. Pandoc's metafile pass and the Hide preview read no XCF and have no token; they keep the default. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BPxh5sKTbvUBdxgCJJnzxZ
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this change?
Follow-up to #1440, from the review: the row-by-row cancellation of a GIMP merge only reached the ImageMagick converter.
ImageReader.Readnow takes an optionalCancellationTokenand passes it toXcf.ReadFlattened, and every engine that reads pictures passes its job's token: PDF (PdfSharp), HEIC, ICNS, upscaling, tracing, image → 3D and Merge images. The converter's own XCF special case is gone; it uses the same path. Pandoc's EMF/WMF pass and the Hide preview read no XCF and have no token, so they keep the default.Type of change
How was it tested?
dotnet format --verify-no-changes: the new optional parameter made xUnit1051 flag one existing call inUpscalerTests, which now passesTestContext.Current.CancellationTokendotnet test: the XCF, PDN, join, ICNS, upscale, HEIC, tracing, 3D and PdfSharp tests pass;Merging_can_be_cancellednow also cancels throughImageReader.Read. The one failure (MediaTests…qta…, FFmpeg) also fails without this change in my container.Screenshots (UI changes)
None.
Checklist
src/Filee.App/Assets/i18n/*.jsonfiles (none added)THIRD-PARTY-NOTICES.md(none)🤖 Generated with Claude Code