Skip to content

Sony ARW Ljpeg tweaks #485

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
LebedevRI merged 2 commits into from
Jun 9, 2023
Merged

Sony ARW Ljpeg tweaks #485

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81569e1
ARW Ljpeg: always use SonyRawImageSize tag
kmilos Jun 9, 2023
dce5b00
ARW Ljpeg: throw a more meaningful error for M/S files
kmilos Jun 9, 2023
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
9 changes: 6 additions & 3 deletions src/librawspeed/decoders/ArwDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ void ArwDecoder::DecodeLJpeg(const TiffIFD* raw) {
uint32_t width = raw->getEntry(TiffTag::IMAGEWIDTH)->getU32();
uint32_t height = raw->getEntry(TiffTag::IMAGELENGTH)->getU32();
uint32_t bitPerPixel = raw->getEntry(TiffTag::BITSPERSAMPLE)->getU32();
uint32_t photometric =
raw->getEntry(TiffTag::PHOTOMETRICINTERPRETATION)->getU32();

if (photometric != 32803)
ThrowRDE("Unsupported photometric interpretation: %u", photometric);

switch (bitPerPixel) {
case 8:
Expand Down Expand Up @@ -352,9 +357,7 @@ void ArwDecoder::DecodeLJpeg(const TiffIFD* raw) {

PostProcessLJpeg();

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
Copy Markdown
Contributor

@da-phil da-phil Jun 9, 2023

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
Copy Markdown
Collaborator Author

@kmilos kmilos Jun 9, 2023 •
edited
Loading

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
Copy Markdown
Member

@LebedevRI LebedevRI Jun 9, 2023

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.

iRectangle2D crop(0, 0, size_entry->getU32(0), size_entry->getU32(1));
mRaw->subFrame(crop);
}
Expand Down