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

Cherry-pick #69

Merged
merged 22 commits into from
Dec 4, 2024
Merged

Cherry-pick #69

merged 22 commits into from
Dec 4, 2024

Conversation

eustas
Copy link
Collaborator

@eustas eustas commented Dec 4, 2024

Cherry-picked: c4941e42 .. 98299fec

Next: 25feb0cb Bump actions/checkout from 4.1.6 to 4.1.7 (#3647)

jonsneyers and others added 21 commits December 4, 2024 08:20
(cherry picked from commit c4941e422908eaea0e625fefeef368ab62f2ca5e)
(cherry picked from commit 117342ab6afaa94366a77b785fe6754a3aed09ac)
(cherry picked from commit ad84ee99e3f0c33a7d408315668818265870eba2)
* add jhgm box

* wip

Co-authored-by: Sami Boukortt <[email protected]>

* move to extras

* wip2

Co-authored-by: Sami Boukortt <[email protected]>

* decompress icc

* decompress icc also when writing

* use correct endianness

* documentation

* mv GetIccTestProfile

* cleanup

* Memory manager, error handling

* extern "C"

* Newline at end of file

* More error management

* build_cleaner

* No designated initializers

* Correct export header now that this is not a separate library

* change `has_color_encoding` to `color_encoding_size`

* properly compress color encoding, similar to icc

* remove gain_map_size

* replace visitor for writer

* replace visitor for reader

* remove internal bundle

* lint

* use byte_order.h

* add golden test

* parametrized tests

* fix test

* fix includes

* add test for JxlGainMapReadBundle

* lint

* compressed icc in gain map bundle

* restructure reading the bundle

* change color encoding size type

* remove TODO

* Bespoke memory manager for the gain map API

* Only copy one byte from uint8_t

* use SafeAdd

* return JXL_FALSE

* check reads within bounds

* actually throw errors with SafeAdd

* also return errors in JxlGainMapReadBundle

* use CanEncode

* use LoadBE and StoreBE

* add struct docstring

* move documention back to fields

* Static functions

* Macros

* Remove accidental semicolon (its absence being the entire point of the do-while)

* Remove leftover file

* no more swap

* rename ADVANCE_CURSOR

* comment about underflow

---------

Co-authored-by: Sami Boukortt <[email protected]>
(cherry picked from commit ba1bfac861315803dc53888abddca8f665c8edf3)
* Skeleton for the compressed ICC API

* Matching names

* build_cleaner

* Span for WriteICC

* Implement compression

* clang-format

* Documentation for the decode function

* oops

* Implement reading

* More consistent naming

* Remove leftover debug code

* Use existing test data for GetIccTestProfile

* Close the reader

* Test

* Fix compressed ICC size

* More straightforward implementation of GetCompressedIccTestProfile

(cherry picked from commit bda6afe400753d3b156b262132dd49188edb29b2)
Turn "unreachable" to Status; reduce number places where it is used; remove "count" member in enum-classes.
Drive-by: straighten includes, use more forwarding

(cherry picked from commit d947eb5f98f04a403bc5e96c1f4c71e6a1b3cca4)
… when doing -e 2 (#3622)

* improve lossless e2/e3 for > 10-bit images and make -E 1 do something for -e 2

* bump up limit for doing fixed e2/e3 tree as a lookup table

* reduce lookup table size

(cherry picked from commit cdb6a667c781bf85679bd085b95fce1f5dd91f80)
Fixes #3621

Co-authored-by: Eugene Kliuchnikov <[email protected]>
(cherry picked from commit ab0bad37135537ef8b40aef4a4d11fe85a878a90)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.6 to 3.25.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@9fdb3e4...2e230e8)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit dd12497fb5e69cbb736fe1ad7049e4ecded9ccd0)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](actions/dependency-review-action@0c155c5...72eb03d)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 9d2cd77930a291dfd96dd8c9febae5323e1fb92c)
(cherry picked from commit fb8b6fdd4007baa3034e15ca426ee9d70b71ff10)
* check multiple highway headers

attempts to fix #3641

* add to find_path

* review comments

* lint

* use break()

* only add break

* lint

(cherry picked from commit 784de18d7bb4c6cf8de7ef68f140dddb3ded3898)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.8 to 3.25.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@2e230e8...23acc5c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 0c46938f280a2a587737e4fccb2ace217f9907b3)
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@125fc84...e28ff12)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit b7582cee94f0450b6b909152168cadeff6898644)
(cherry picked from commit 4e18a363bf24f52c5fc75205402e159aad7b7bfd)
In the render pipeline, we promise 16 floats before the pointer passed to
each stage to be readable.

Because of implementation details of the pre-memory-manager image
allocation, that was always the case before. Once we started using the
memory manager, this is no longer the case. This PR introduces the
possibility to explicitly ask for such padding and uses it in the render
pipeline.

(cherry picked from commit af7bb4c7c604c931a749fa60c35b7f0405d1caad)
(cherry picked from commit e0ba0826e7e25489862a7f6e23749305e97d8e70)
* Fix gain_map header in C

* Also fix compressed_icc.h

* Fix compressed_icc with memory manager with null fields

* Add jhgm read support to jxlinfo

(cherry picked from commit bc615c1575ef7c2b853a8e29d133e7a34c73eb17)
Drive-by: pull closures out of macros
(cherry picked from commit d76feb766c3a6158852cbf59648e03a516431fd8)
…ing to wait for *either* DEC_SUCCESS or DEC_BOX (#3657)

(cherry picked from commit 5494b0ca894792140b469d3cb962f9c3196fb71b)
Drive-by: add standalone enc_fast_lossless target
(cherry picked from commit 98299fec196db9d98263b690e1f9076cda22fdb5)
@eustas eustas requested a review from mo271 December 4, 2024 10:35
@eustas eustas merged commit cfa83de into google:main Dec 4, 2024
55 of 69 checks passed
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.

5 participants