Fix regression with demosaiced DNGs caused by 831a9bbd #6997
Conversation
This file contains 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
|
It's probably best to refactor these checks (including the first if-statement in bool checkRawDataDimensions(const array2D<float> &rawData, const RawImage &rawImage, int width, int height)
{
const int colors = (rawImage.getSensorType() == ST_BAYER ||
rawImage.getSensorType() == ST_FUJI_XTRANS ||
rawImage.get_colors() == 1)
? 1
: 3;
return rawData.getHeight() == height && rawData.getWidth() == colors * width;
} |
|
Great! Thanks for the suggestions including where to get the equivalent of SamplesPerPixel. I've had a few too many Tasty Beverages for tonight, I'll work on this refactor tomorrow. |
Uses a new function checkRawDataDimensions as suggested/written by @Lawrence37 to verify that image dimensions are correct. Fixes Beep6581#6996
Entropy512
force-pushed
the
fix_demosaiced_dng
branch
from
52b7dac
to
91dc97e
Compare
Lawrence37
reviewed
Mar 24, 2024
Comment on lines
+745
to
+754
| bool checkRawDataDimensions(const array2D<float> &rawData, const RawImage &rawImage, int width, int height) | ||
| { | ||
| const int colors = (rawImage.getSensorType() == rtengine::ST_BAYER || | ||
| rawImage.getSensorType() == rtengine::ST_FUJI_XTRANS || | ||
| rawImage.get_colors() == 1) | ||
| ? 1 | ||
| : 3; | ||
| return rawData.getHeight() == height && rawData.getWidth() == colors * width; | ||
| } | ||
|
|
There was a problem hiding this comment.
Better to put this in the anonymous namespace at the top of the file.
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.
Demosaiced DNGs (aka LinearRAW PhotometricInterpretation) have 3 samples per pixel, so rawData.getWidth() returns triple the width Only throw an assert if getWidth is not a multiple of W. This new implementation assumes that getWidth() will never be zero when getHeight() is nonzero
Fixes #6996