Add an ImageInput::valid_file(IOProxy) overload #3826
Merged
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
jessey-git
changed the title
lgritz
reviewed
May 3, 2023
lgritz
requested changes
May 3, 2023
|
The CI failure for icc doesn't appear to be related to your changes, it's (temporarily?) unable to download package containing the icc compiler. So I'm going to merge. |
lgritz
merged commit a1d8dbc
into
AcademySoftwareFoundation:master
19 of 20 checks passed
5 tasks
lgritz
pushed a commit
that referenced
this pull request
May 17, 2023
…D, and WEBP (#3831) Following up #3826, this implements efficient `valid_file` support for DDS, DPX, PSD, HDR, and WEBP. The quick magic/signature checks were abstracted into small helper functions where necessary to eliminate duplicate code. For WEBP, some redundant checks were also removed and there's also a fix for a `uint64_t` vs `size_t` check which would have caused issues on 32-bit builds. The PSD changes exposed an issue with array attributes. During a normal ImageInput create+open sequence, an ImageInput may be opened then closed and then opened again. Array attributes are not cleared as part of close and so their contents will be doubled up next time they are read into the existing `m_spec`. This PR does not fix that general problem but now that PSD has a proper valid_file which doesn't do an open, the array attributes are now correct: ``` This PR 2023-05-06T02:32:05.8774584Z - photoshop:ColorMode: 3 2023-05-06T02:32:05.8774888Z - photoshop:ICCProfile: "sRGB IEC61966-2.1" 2023-05-06T02:32:05.8775194Z - photoshop:LayerName: 1, 2, 3 2023-05-06T02:32:05.8775436Z - photoshop:LayerText: 1, 2, 3 vs. the current 2023-05-06T02:32:05.8775725Z + photoshop:ColorMode: 3, 3 2023-05-06T02:32:05.8776023Z + photoshop:ICCProfile: "sRGB IEC61966-2.1" 2023-05-06T02:32:05.8776494Z + photoshop:LayerName: 1, 2, 3, 1, 2, 3 2023-05-06T02:32:05.8776746Z + photoshop:LayerText: 1, 2, 3, 1, 2, 3 ```
birsoyo
pushed a commit
to birsoyo/oiio
that referenced
this pull request
Jun 8, 2023
…D, and WEBP (AcademySoftwareFoundation#3831) Following up AcademySoftwareFoundation#3826, this implements efficient `valid_file` support for DDS, DPX, PSD, HDR, and WEBP. The quick magic/signature checks were abstracted into small helper functions where necessary to eliminate duplicate code. For WEBP, some redundant checks were also removed and there's also a fix for a `uint64_t` vs `size_t` check which would have caused issues on 32-bit builds. The PSD changes exposed an issue with array attributes. During a normal ImageInput create+open sequence, an ImageInput may be opened then closed and then opened again. Array attributes are not cleared as part of close and so their contents will be doubled up next time they are read into the existing `m_spec`. This PR does not fix that general problem but now that PSD has a proper valid_file which doesn't do an open, the array attributes are now correct: ``` This PR 2023-05-06T02:32:05.8774584Z - photoshop:ColorMode: 3 2023-05-06T02:32:05.8774888Z - photoshop:ICCProfile: "sRGB IEC61966-2.1" 2023-05-06T02:32:05.8775194Z - photoshop:LayerName: 1, 2, 3 2023-05-06T02:32:05.8775436Z - photoshop:LayerText: 1, 2, 3 vs. the current 2023-05-06T02:32:05.8775725Z + photoshop:ColorMode: 3, 3 2023-05-06T02:32:05.8776023Z + photoshop:ICCProfile: "sRGB IEC61966-2.1" 2023-05-06T02:32:05.8776494Z + photoshop:LayerName: 1, 2, 3, 1, 2, 3 2023-05-06T02:32:05.8776746Z + photoshop:LayerText: 1, 2, 3, 1, 2, 3 ```
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.
Description
Every format that has an existing
valid_file(std::string)implementation, and which supports anioproxy, now also has a
valid_file(IOProxy)implementation for completeness.The existing std::string overloads have been implemented in terms of the IOProxy overload where
possible to cut down on the boilerplate. This is done at the base of the hierarchy in ImageInput.
The remaining formats that support ioproxy, but do not currently have a
valid_filemethod, will besubmitted in a follow-up PR as the additional logic required for those will require closer review.
Tests
I haven't had much time/luck to sort out running the tests locally on Windows, or setting up a parallel WSL
environment, so I admit this is coming in with no test coverage beyond it working locally for me in a
test app. The app invokes both
valid_filemethods on a directory filled with various files for the formats in question.Checklist:
have previously submitted a Contributor License Agreement
(individual, and if there is any way my
employers might think my programming belongs to them, then also
corporate).
(adding new test cases if necessary).