Skip to content

Sony ARW Ljpeg tweaks#485

Merged
LebedevRI merged 2 commits intodarktable-org:developfrom
kmilos:kmilos/sony_ljpeg_tweaks
Jun 9, 2023
Merged

Sony ARW Ljpeg tweaks#485
LebedevRI merged 2 commits intodarktable-org:developfrom
kmilos:kmilos/sony_ljpeg_tweaks

Conversation

@kmilos
Copy link
Collaborator

@kmilos kmilos commented Jun 9, 2023

Follow-up to #484

@kmilos kmilos requested a review from LebedevRI as a code owner June 9, 2023 08:17
kmilos added 2 commits June 9, 2023 10:21
It is present in all lossless samples available on RPU (ILCE-1, ILCE-7M4, ILCE-7RM5)
M/S files are not CFAs but demosaiced YCbCr (PhotometricInterpretation=6)
@kmilos kmilos force-pushed the kmilos/sony_ljpeg_tweaks branch from 7330b4e to dce5b00 Compare June 9, 2023 08:21
const TiffEntry* size_entry = raw->hasEntry(TiffTag::SONYRAWIMAGESIZE)
? raw->getEntry(TiffTag::SONYRAWIMAGESIZE)
: raw->getEntry(TiffTag::DEFAULTCROPSIZE);
const TiffEntry* size_entry = raw->getEntry(TiffTag::SONYRAWIMAGESIZE);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so no fallback is necessary, we're always sure to have this EXIF marker available?

Copy link
Collaborator Author

@kmilos kmilos Jun 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're always sure to have this EXIF marker available?

Seems to be the case so far, as mentioned.

In the worst case, I'd rather return the uncropped image w/ black borders than the DNG crop, I feel it's more consistent with the stated behaviour:

RawSpeed does NOT…

crop the image to the same sizes as manufactures, but supplies biggest possible images.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, getEntry() throws if you query for an entry that will not be found.

@LebedevRI
Copy link
Member

Makes sense, thank you!

@LebedevRI LebedevRI merged commit 148dd17 into darktable-org:develop Jun 9, 2023
@kmilos kmilos deleted the kmilos/sony_ljpeg_tweaks branch June 9, 2023 13:43
@kmilos
Copy link
Collaborator Author

kmilos commented Jun 9, 2023

Do we feel cheeky enough to drop this on dt? ;)

I suspect they'll freeze and tag 4.4 very soon... @TurboGit

@LebedevRI
Copy link
Member

Even though LJpegDecompressor is no longer affected, i'd still prefer to let it fuzz for a few more days.
What is the cut-off date?

@TurboGit
Copy link
Member

TurboGit commented Jun 9, 2023

@LebedevRI : It is planed for June 14th, I can move it one day on 15th if necessary.

@LebedevRI
Copy link
Member

Ah, that's plenty of time then.
I'll wait some more, and update submodule on 13'th then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants