Repository navigation
Fix 4-Bayer raws falling into 3-channel linear write path - #21463
Merged
Merged
Conversation
andriiryzhkov
added
bugfix
kofa73
reviewed
Jul 1, 2026
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
3 participants
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.
Follow-up to #21429. @kofa73 caught a leftover mismatch in the LINEAR write path.
4-Bayer raws (CYGM/RGBE) classify as LINEAR per the prior June fix, but they keep a 1-channel mosaic buffer (
mip_channels == 1) while the linear write loop writes 3 channels per pixel – clobbering neighbour pixels. Affected hardware is from 2000–2003 and largely unsupported by rawspeed today, but the mismatch is real.Two small changes:
restore_raw_linear.c: guard the 3-channel write withmip_channels >= 3. 4-Bayer falls into a no-op branch and the original mosaic pixel survives from the upfrontmemcpy(patched, mbuf.buf, ...)neural_restore.c: skip the "this image is already pre-demosaiced" toast for 4-Bayer in both batch and preview paths – it's misleading since 4-Bayer is a mosaic, not pre-demosaiced