Reimplement image input handling for toktx. #702
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
* git subrepo clone --branch=9.1.0 https://github.com/fmtlib/fmt.git other_projects/fmt subrepo: subdir: "other_projects/fmt" merged: "a3370119" upstream: origin: "https://github.com/fmtlib/fmt.git" branch: "9.1.0" commit: "a3370119" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "dbb99be"
* Adds imageio library.
* Reworks toktx to use the imageio library and break up the
gigantic main loop.
* Fixes {fmt} licensing to pass reuse lint.
The output plugins and the EXR input plugin are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.
* Remove unnecessary include of imageio.h in image.hpp. * Remove imageio include path from unittests. Was there for image.hpp required by image_unittests.
Works without it on Xcode.
in hope of find where the error happens. Revert to building both configs.
|
This PR shows as having a failed build because the VS2017 build did not work. That has been removed from CI but GitHub failed to notice the removal and continues to show the failed build. |
KaperD
pushed a commit
to KaperD/KTX-Software
that referenced
this pull request
Feb 21, 2024
* Add imageio library.
* Rework toktx to use the imageio library and break up the
gigantic main loop.
* Add git subrepo of {fmt} library 9.1.0 used by imageio
* Remove VS2017 builds from CI as fmt needs a more recent version.
The output plugins are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.
fmt was previously added to another branch via PR KhronosGroup#662.
* Adopt fmt 9.1.0 for formatting (KhronosGroup#662)
* git subrepo clone --branch=9.1.0 https://github.com/fmtlib/fmt.git other_projects/fmt
subrepo:
subdir: "other_projects/fmt"
merged: "a3370119"
upstream:
origin: "https://github.com/fmtlib/fmt.git"
branch: "9.1.0"
commit: "a3370119"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "dbb99be"
The parent in other_projects/fmt/.gitrepo has been updated to account for this current PR.
Co-authored-by: Császár Mátyás <[email protected]>
KaperD
pushed a commit
to KaperD/KTX-Software
that referenced
this pull request
Feb 22, 2024
* Add imageio library.
* Rework toktx to use the imageio library and break up the
gigantic main loop.
* Add git subrepo of {fmt} library 9.1.0 used by imageio
* Remove VS2017 builds from CI as fmt needs a more recent version.
The output plugins are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.
fmt was previously added to another branch via PR KhronosGroup#662.
* Adopt fmt 9.1.0 for formatting (KhronosGroup#662)
* git subrepo clone --branch=9.1.0 https://github.com/fmtlib/fmt.git other_projects/fmt
subrepo:
subdir: "other_projects/fmt"
merged: "a3370119"
upstream:
origin: "https://github.com/fmtlib/fmt.git"
branch: "9.1.0"
commit: "a3370119"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "dbb99be"
The parent in other_projects/fmt/.gitrepo has been updated to account for this current PR.
Co-authored-by: Császár Mátyás <[email protected]>
KaperD
pushed a commit
to KaperD/KTX-Software
that referenced
this pull request
Feb 22, 2024
* Add imageio library.
* Rework toktx to use the imageio library and break up the
gigantic main loop.
* Add git subrepo of {fmt} library 9.1.0 used by imageio
* Remove VS2017 builds from CI as fmt needs a more recent version.
The output plugins are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.
fmt was previously added to another branch via PR KhronosGroup#662.
* Adopt fmt 9.1.0 for formatting (KhronosGroup#662)
* git subrepo clone --branch=9.1.0 https://github.com/fmtlib/fmt.git other_projects/fmt
subrepo:
subdir: "other_projects/fmt"
merged: "a3370119"
upstream:
origin: "https://github.com/fmtlib/fmt.git"
branch: "9.1.0"
commit: "a3370119"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "dbb99be"
The parent in other_projects/fmt/.gitrepo has been updated to account for this current PR.
Co-authored-by: Császár Mátyás <[email protected]>
KaperD
pushed a commit
to KaperD/KTX-Software
that referenced
this pull request
Feb 22, 2024
* Add imageio library.
* Rework toktx to use the imageio library and break up the
gigantic main loop.
* Add git subrepo of {fmt} library 9.1.0 used by imageio
* Remove VS2017 builds from CI as fmt needs a more recent version.
The output plugins are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.
fmt was previously added to another branch via PR KhronosGroup#662.
* Adopt fmt 9.1.0 for formatting (KhronosGroup#662)
* git subrepo clone --branch=9.1.0 https://github.com/fmtlib/fmt.git other_projects/fmt
subrepo:
subdir: "other_projects/fmt"
merged: "a3370119"
upstream:
origin: "https://github.com/fmtlib/fmt.git"
branch: "9.1.0"
commit: "a3370119"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "dbb99be"
The parent in other_projects/fmt/.gitrepo has been updated to account for this current PR.
Co-authored-by: Császár Mátyás <[email protected]>
KaperD
pushed a commit
to KaperD/KTX-Software
that referenced
this pull request
Feb 22, 2024
* Add imageio library.
* Rework toktx to use the imageio library and break up the
gigantic main loop.
* Add git subrepo of {fmt} library 9.1.0 used by imageio
* Remove VS2017 builds from CI as fmt needs a more recent version.
The output plugins are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.
fmt was previously added to another branch via PR KhronosGroup#662.
* Adopt fmt 9.1.0 for formatting (KhronosGroup#662)
* git subrepo clone --branch=9.1.0 https://github.com/fmtlib/fmt.git other_projects/fmt
subrepo:
subdir: "other_projects/fmt"
merged: "a3370119"
upstream:
origin: "https://github.com/fmtlib/fmt.git"
branch: "9.1.0"
commit: "a3370119"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "dbb99be"
The parent in other_projects/fmt/.gitrepo has been updated to account for this current PR.
Co-authored-by: Császár Mátyás <[email protected]>
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.
gigantic main loop.
The output plugins and the EXR input plugin are empty shells.
All toktx tests pass. Some golden images are modified due to
toktx now doing a transfer function conversion from BT709
to sRGB when reading npbm files. Some tests are modified because
toktx no longer chooses sRGB or Linear when the gamma is
somewhere between them.