Skip to content
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.

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

Better ARQ Support #6483

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from

Conversation

Calandracas606
Copy link

@Calandracas606 Calandracas606 commented May 18, 2022

Added Support for ARQ files from ILCE-1, both 4 and 16 shot
Added Support for ARQ files from ILCE-7M4

"Fixed" possible bug where tiff_ifd[].samples was getting overwritten. This probably hasn't been noticed since it requires the TIFF tags to be parsed in a specific order, and affects files with 4 samples per pixel (pixel shift)

Some pixel shift data about Sony bodies other than ILCE-7RM3 is missing, added some TODOs to show where to add the data.

Sony bodies without the proper pixel shift data will default to ILCE-7RM3. Pentax still defaults to Pentax.

This is my first time contributing to an open source project, so please let me know if I've made any mistakes during this process.

@Entropy512
Copy link
Contributor

Is ILCE-7M4 a typo? Did you mean ILCE-7R4? I was fairly certain pixel shift was exclusive to the R family and the 1.

@Calandracas606
Copy link
Author

Is ILCE-7M4 a typo? Did you mean ILCE-7R4? I was fairly certain pixel shift was exclusive to the R family and the 1.

My mistake, for whatever reason I thought the ILCE-7M4 had pixel shift, but it appears that I was incorrect

@Calandracas606
Copy link
Author

Removed the comments and check for ILCE-7M4

@Calandracas606
Copy link
Author

This branch should be ready for dev review when someone has the chance

@Lawrence37 Lawrence37 added this to the v6.0 milestone Oct 4, 2022
Comment on lines 6442 to 6443
if (tiff_ifd[ifd].samples != 4)
tiff_ifd[ifd].samples = len & 7; // possible bug? should this be .bps instead of .samples ?
Copy link
Collaborator

Choose a reason for hiding this comment

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

FYI LibRaw avoids resetting the samples if the tag is 258 and it is already set.
https://github.com/LibRaw/LibRaw/blob/6fffd414bfda63dfef2276ae07f7ca36660b8888/src/metadata/tiff.cpp#L438-L439

Copy link
Collaborator

Choose a reason for hiding this comment

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

This will change the samples if it's anything other than 4, whereas LibRaw only does so if samples hasn't been set. I wonder if this will be problematic.

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.

None yet

3 participants