diff --git a/media/libjxl/moz.yaml b/media/libjxl/moz.yaml index 0941708eaae6..a9f03fe669ca 100644 --- a/media/libjxl/moz.yaml +++ b/media/libjxl/moz.yaml @@ -20,12 +20,12 @@ origin: # Human-readable identifier for this version/release # Generally "version NNN", "tag SSS", "bookmark SSS" - release: commit 44778c6902084bd239c5fb8eaa53bfd90dd9face (2021-05-21T20:39:54.000+02:00). + release: commit bdde644b94c125a15e532b2572b96306371a7d4e (2021-05-25T19:02:18.000+02:00). # Revision to pull in # Must be a long or short commit SHA (long preferred) # NOTE(krosylight): Update highway together when updating this! - revision: 44778c6902084bd239c5fb8eaa53bfd90dd9face + revision: bdde644b94c125a15e532b2572b96306371a7d4e # The package's license, where possible using the mnemonic from # https://spdx.org/licenses/ diff --git a/third_party/jpeg-xl/AUTHORS b/third_party/jpeg-xl/AUTHORS new file mode 100644 index 000000000000..10c27755c643 --- /dev/null +++ b/third_party/jpeg-xl/AUTHORS @@ -0,0 +1,20 @@ +# List of the project authors for copyright purposes. When contributing to the +# project add your name or your organization's name to this list. See +# CONTRIBUTING.md for details. +# +# For organizations: +# Organization +# +# For individuals: +# Name +# +# Please keep each list sorted. If you wish to change your email address please +# send a pull request. + +# Organizations: +Cloudinary Ltd. <*@cloudinary.com> +Google LLC <*@google.com> + +# Individuals: +Jon Sneyers +Pieter Wuille diff --git a/third_party/jpeg-xl/CMakeLists.txt b/third_party/jpeg-xl/CMakeLists.txt index a7c71221e28d..812894a58895 100644 --- a/third_party/jpeg-xl/CMakeLists.txt +++ b/third_party/jpeg-xl/CMakeLists.txt @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Ubuntu bionic ships with cmake 3.10. cmake_minimum_required(VERSION 3.10) diff --git a/third_party/jpeg-xl/CODE_OF_CONDUCT.md b/third_party/jpeg-xl/CODE_OF_CONDUCT.md new file mode 100644 index 000000000000..b2d81a32142d --- /dev/null +++ b/third_party/jpeg-xl/CODE_OF_CONDUCT.md @@ -0,0 +1,93 @@ +# Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of +experience, education, socio-economic status, nationality, personal appearance, +race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, or to ban temporarily or permanently any +contributor for other behaviors that they deem inappropriate, threatening, +offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +This Code of Conduct also applies outside the project spaces when the Project +Steward has a reasonable belief that an individual's behavior may have a +negative impact on the project or its community. + +## Conflict Resolution + +We do not believe that all conflict is bad; healthy debate and disagreement +often yield positive results. However, it is never okay to be disrespectful or +to engage in behavior that violates the project’s code of conduct. + +If you see someone violating the code of conduct, you are encouraged to address +the behavior directly with those involved. Many issues can be resolved quickly +and easily, and this gives people more control over the outcome of their +dispute. If you are unable to resolve the matter for any reason, or if the +behavior is threatening or harassing, report it. We are dedicated to providing +an environment where participants feel welcome and safe. + +Reports should be directed to Jyrki Alakuijala , the +Project Steward(s) for JPEG XL. It is the Project Steward’s duty to +receive and address reported violations of the code of conduct. They will then +work with a committee consisting of representatives from the Open Source +Programs Office and the Google Open Source Strategy team. If for any reason you +are uncomfortable reaching out to the Project Steward, please email +opensource@google.com. + +We will investigate every complaint, but you may not receive a direct response. +We will use our discretion in determining when and how to follow up on reported +incidents, which may range from not taking action to permanent expulsion from +the project and project-sponsored spaces. We will notify the accused of the +report and provide them an opportunity to discuss it before any action is taken. +The identity of the reporter will be omitted from the details of the report +supplied to the accused. In potentially harmful situations, such as ongoing +harassment or threats to anyone's safety, we may take action without notice. + +## Attribution + +This Code of Conduct is adapted from the Contributor Covenant, version 1.4, +available at +https://www.contributor-covenant.org/version/1/4/code-of-conduct.html diff --git a/third_party/jpeg-xl/CONTRIBUTING.md b/third_party/jpeg-xl/CONTRIBUTING.md index 3e3c9f9685db..56f82f816434 100644 --- a/third_party/jpeg-xl/CONTRIBUTING.md +++ b/third_party/jpeg-xl/CONTRIBUTING.md @@ -1,10 +1,115 @@ -# How to Contribute +# Contributing to libjxl -We are currently unable to accept patches to this project, but we'd very much -appreciate if you open a Gitlab issue for any bug reports/feature requests. -We will be happy to investigate and hopefully fix any issues. +## Contributing with bug reports + +For security-related issues please see [SECURITY.md](SECURITY.md). + +We welcome suggestions, feature requests and bug reports. Before opening a new +issue please take a look if there is already an existing one in the following +link: + + * https://github.com/libjxl/libjxl/issues + +## Contributing with patches and Pull Requests + +We'd love to accept your contributions to the JPEG XL Project. Please read +through this section before sending a Pull Request. + +### Contributor License Agreements + +Our project is open source under the terms outlined in the [LICENSE](LICENSE) +and [PATENTS](PATENTS) files. Before we can accept your contributions, even for +small changes, there are just a few small guidelines you need to follow: + +Please fill out either the individual or corporate Contributor License Agreement +(CLA) with Google. JPEG XL Project is an an effort by multiple individuals and +companies, including the initial contributors Cloudinary and Google, but Google +is the legal entity in charge of receiving these CLA and relicensing this +software: + + * If you are an individual writing original source code and you're sure you + own the intellectual property, then you'll need to sign an [individual + CLA](https://code.google.com/legal/individual-cla-v1.0.html). + + * If you work for a company that wants to allow you to contribute your work, + then you'll need to sign a [corporate + CLA](https://code.google.com/legal/corporate-cla-v1.0.html). + +Follow either of the two links above to access the appropriate CLA and +instructions for how to sign and return it. Once we receive it, we'll be able +to accept your pull requests. + +***NOTE***: Only original source code from you and other people that have signed +the CLA can be accepted into the main repository. + +### Code Reviews + +All submissions, including submissions by project members, require review. We +use GitHub pull requests for this purpose. Consult +[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more +information on using pull requests. + +### Contribution philosophy + + * Prefer small changes, even if they don't implement a complete feature. Small + changes are easier to review and can be submitted faster. Think about what's + the smallest unit you can send that makes sense to review and submit in + isolation. For example, new modules that are not yet used by the tools but + have their own unittests are ok. If you have unrelated changes that + you discovered while working on something else, please send them in a + different Pull Request. If your are refactoring code and changing + functionality try to send the refactor first without any change in + functionality. Reviewers may ask you to split a Pull Request and it is + easier to create a smaller change from the beginning. + + * Describe your commits. Add a meaningful description to your commit message, explain what you are changing if it is not trivially obvious, but more importantly explain *why* you are making those changes. For example "Fix + build" is not a good commit message, describe what build and if it makes sense + why is this fixing it or why was it failing without this. It is very likely + that people far in the future without any context you have right now will be + looking at your commit trying to figure out why was the change introduced. If + related to an issue in this or another repository include a link to it. + + * Code Style: We follow the [Google C++ Coding + Style](https://google.github.io/styleguide/cppguide.html). A + [clang-format](https://clang.llvm.org/docs/ClangFormat.html) configuration + file is available to automatically format your code, you can invoke it with + the `./ci.sh lint` helper tool. + + * Testing: Test your change and explain in the commit message *how* your + commit was tested. For example adding unittests or in some cases just testing + with the existing ones is enough. In any case, mention what testing was + performed so reviewers can evaluate whether that's enough testing. In many + cases, testing that the Continuous Integration workflow passes is enough. + + * Make one commit per Pull Request / review, unless there's a good reason not + to. If you have multiple changes send multiple Pull Requests and each one can + have its own review. + + * When addressing comments from reviewers prefer to squash or fixup your + edits and force-push your commit. When merging changes into the repository we + don't want to include the history of code review back and forth changes or + typos. Reviewers can click on the "force-pushed" automatic comment on a Pull + Request to see the changes between versions. We use "Rebase and merge" policy + to keep a linear git history which is easier to reason about. + +### Contributing checklist. + + * Sign the CLA (only needed once per user, see above). + + * AUTHORS: If this is your first contribution, add your name or your + company name to the [AUTHORS](AUTHORS) file for copyright tracking purposes. + + * Style guide. Check `./ci.sh lint`. + + * Meaningful commit description: What and *why*, links to issues, testing + procedure. + + * Squashed multiple edits into a single commit. + + * Upload your changes to your fork and [create a Pull + Request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). # Community Guidelines -This project follows -[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). +This project follows [Google's Open Source Community +Guidelines](https://opensource.google.com/conduct/). diff --git a/third_party/jpeg-xl/LICENSE b/third_party/jpeg-xl/LICENSE index 6b0b1270ff0c..c66034b105f2 100644 --- a/third_party/jpeg-xl/LICENSE +++ b/third_party/jpeg-xl/LICENSE @@ -1,203 +1,27 @@ +Copyright (c) the JPEG XL Project Authors. +All rights reserved. - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. - 1. Definitions. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/jpeg-xl/PATENTS b/third_party/jpeg-xl/PATENTS new file mode 100644 index 000000000000..c95b8f4105f2 --- /dev/null +++ b/third_party/jpeg-xl/PATENTS @@ -0,0 +1,22 @@ +Additional IP Rights Grant (Patents) + +"This implementation" means the copyrightable works distributed by +Google as part of the JPEG XL project. + +Google hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable (except as stated in this section) +patent license to make, have made, use, offer to sell, sell, import, +transfer and otherwise run, modify and propagate the contents of this +implementation of JPEG XL, where such license applies only to those patent +claims, both currently owned or controlled by Google and acquired in +the future, licensable by Google that are necessarily infringed by this +implementation of JPEG XL. This grant does not include claims that would be +infringed only as a consequence of further modification of this +implementation. If you or your agent or exclusive licensee institute or +order or agree to the institution of patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging +that this implementation of JPEG XL or any code incorporated within this +implementation of JPEG XL constitutes direct or contributory patent +infringement, or inducement of patent infringement, then any patent +rights granted to you under this License for this implementation of JPEG XL +shall terminate as of the date such litigation is filed. diff --git a/third_party/jpeg-xl/README.md b/third_party/jpeg-xl/README.md index 5c386617564f..27fd438a2c89 100644 --- a/third_party/jpeg-xl/README.md +++ b/third_party/jpeg-xl/README.md @@ -194,8 +194,14 @@ occurred while loading or encoding/decoding the image. ## License -This software is available under Apache 2.0 license which can be found in the -[LICENSE](LICENSE) file. +This software is available under a 3-clause BSD license which can be found in +the [LICENSE](LICENSE) file, with an "Additional IP Rights Grant" as outlined in +the [PATENTS](PATENTS) file. + +Please note that the PATENTS file only mentions Google since Google is the legal +entity receiving the Contributor License Agreements (CLA) from all contributors +to the JPEG XL Project, including the initial main contributors to the JPEG XL +format: Cloudinary and Google. ## Additional documentation @@ -212,7 +218,7 @@ This software is available under Apache 2.0 license which can be found in the * [Building on Debian](doc/developing_in_debian.md) - for experts only * [Building on Windows](doc/developing_in_windows.md) - for experts only * [More information on testing/build options](doc/building_and_testing.md) -* [Git guide for JPEG XL](doc/developing_in_gitlab.md) - for developers only +* [Git guide for JPEG XL](doc/developing_in_github.md) - for developers only * [Building Web Assembly artifacts](doc/building_wasm.md) ### Contact diff --git a/third_party/jpeg-xl/bash_test.sh b/third_party/jpeg-xl/bash_test.sh index 14869d63ce12..8820c3ad2b02 100755 --- a/third_party/jpeg-xl/bash_test.sh +++ b/third_party/jpeg-xl/bash_test.sh @@ -1,17 +1,8 @@ #!/bin/bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Tests implemented in bash. These typically will run checks about the source # code rather than the compiled one. @@ -72,14 +63,22 @@ test_include_collision() { test_copyright() { local ret=0 local f - for f in $(git ls-files | grep -E '(\.cc|\.cpp|\.h|\.sh|\.m|\.py)$'); do + for f in $( + git ls-files | grep -E \ + '(Dockerfile.*|\.c|\.cc|\.cpp|\.gni|\.h|\.java|\.sh|\.m|\.py|\.ui)$'); do if [[ "${f#third_party/}" == "$f" ]]; then # $f is not in third_party/ if ! head -n 10 "$f" | - grep -F 'Copyright (c) the JPEG XL Project' >/dev/null ; then + grep -F 'Copyright (c) the JPEG XL Project Authors.' >/dev/null ; then echo "$f: Missing Copyright blob near the top of the file." >&2 ret=1 fi + if ! head -n 10 "$f" | + grep -F 'Use of this source code is governed by a BSD-style' \ + >/dev/null ; then + echo "$f: Missing License blob near the top of the file." >&2 + ret=1 + fi fi done return ${ret} diff --git a/third_party/jpeg-xl/ci.sh b/third_party/jpeg-xl/ci.sh index 344f1a92a606..63d3f2768090 100755 --- a/third_party/jpeg-xl/ci.sh +++ b/third_party/jpeg-xl/ci.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Continuous integration helper module. This module is meant to be called from # the .gitlab-ci.yml file during the continuous integration build, as well as diff --git a/third_party/jpeg-xl/debian/copyright b/third_party/jpeg-xl/debian/copyright index c01ec81e6071..84b54674cb61 100644 --- a/third_party/jpeg-xl/debian/copyright +++ b/third_party/jpeg-xl/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: jpeg-xl Files: * Copyright: 2020 the JPEG XL Project -License: Apache-2.0 +License: BSD-3-clause Files: third_party/sjpeg/* Copyright: 2017 Google, Inc diff --git a/third_party/jpeg-xl/deps.sh b/third_party/jpeg-xl/deps.sh index c28979a52799..777d20fd72ca 100755 --- a/third_party/jpeg-xl/deps.sh +++ b/third_party/jpeg-xl/deps.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # This file downloads the dependencies needed to build JPEG XL into third_party. # These dependencies are normally pulled by gtest. diff --git a/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder b/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder index a01b2a9be70a..16e0077eea01 100644 --- a/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder +++ b/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Build an Ubuntu-based docker image with the installed software needed to # develop and test JPEG XL. diff --git a/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder-run-aarch64 b/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder-run-aarch64 index fadd50c5c438..a9f38a401564 100644 --- a/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder-run-aarch64 +++ b/third_party/jpeg-xl/docker/Dockerfile.jpegxl-builder-run-aarch64 @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Build an Ubuntu-based docker image for aarch64 with the installed software # needed to run JPEG XL. This is only useful when running on actual aarch64 diff --git a/third_party/jpeg-xl/docker/build.sh b/third_party/jpeg-xl/docker/build.sh index 5ddcd05ead9f..3d4727f6a4f3 100755 --- a/third_party/jpeg-xl/docker/build.sh +++ b/third_party/jpeg-xl/docker/build.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. set -eu diff --git a/third_party/jpeg-xl/docker/scripts/emsdk_install.sh b/third_party/jpeg-xl/docker/scripts/emsdk_install.sh index e0dac04e2366..eaa687504fc5 100755 --- a/third_party/jpeg-xl/docker/scripts/emsdk_install.sh +++ b/third_party/jpeg-xl/docker/scripts/emsdk_install.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. EMSDK_URL="https://github.com/emscripten-core/emsdk/archive/master.tar.gz" EMSDK_DIR="/opt/emsdk" diff --git a/third_party/jpeg-xl/docker/scripts/jpegxl_builder.sh b/third_party/jpeg-xl/docker/scripts/jpegxl_builder.sh index 6ebffdb22714..00ec6d25b9ec 100755 --- a/third_party/jpeg-xl/docker/scripts/jpegxl_builder.sh +++ b/third_party/jpeg-xl/docker/scripts/jpegxl_builder.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Main entry point for all the Dockerfile for jpegxl-builder. This centralized # file helps sharing code and configuration between Dockerfiles. diff --git a/third_party/jpeg-xl/docker/scripts/msan_install.sh b/third_party/jpeg-xl/docker/scripts/msan_install.sh index 10c9eb65c20c..0216f62b0409 100755 --- a/third_party/jpeg-xl/docker/scripts/msan_install.sh +++ b/third_party/jpeg-xl/docker/scripts/msan_install.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. set -eu diff --git a/third_party/jpeg-xl/docker/scripts/qemu_install.sh b/third_party/jpeg-xl/docker/scripts/qemu_install.sh index fdd99951fe77..8106c4471d9d 100755 --- a/third_party/jpeg-xl/docker/scripts/qemu_install.sh +++ b/third_party/jpeg-xl/docker/scripts/qemu_install.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. QEMU_RELEASE="4.1.0" QEMU_URL="https://download.qemu.org/qemu-${QEMU_RELEASE}.tar.xz" diff --git a/third_party/jpeg-xl/examples/CMakeLists.txt b/third_party/jpeg-xl/examples/CMakeLists.txt index 22c1a632753a..1ce9930c6ee2 100644 --- a/third_party/jpeg-xl/examples/CMakeLists.txt +++ b/third_party/jpeg-xl/examples/CMakeLists.txt @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. add_executable(decode_oneshot decode_oneshot.cc) target_link_libraries(decode_oneshot jxl_dec jxl_threads) diff --git a/third_party/jpeg-xl/examples/decode_oneshot.cc b/third_party/jpeg-xl/examples/decode_oneshot.cc index 24488eacb6fa..61523f674896 100644 --- a/third_party/jpeg-xl/examples/decode_oneshot.cc +++ b/third_party/jpeg-xl/examples/decode_oneshot.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // This C++ example decodes a JPEG XL image in one shot (all input bytes // available at once). The example outputs the pixels and color information to a diff --git a/third_party/jpeg-xl/examples/encode_oneshot.cc b/third_party/jpeg-xl/examples/encode_oneshot.cc index f0baea56ea0a..1ecd7071553a 100644 --- a/third_party/jpeg-xl/examples/encode_oneshot.cc +++ b/third_party/jpeg-xl/examples/encode_oneshot.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // This example encodes a file containing a floating point image to another // file containing JPEG XL image with a single frame. diff --git a/third_party/jpeg-xl/examples/jxlinfo.c b/third_party/jpeg-xl/examples/jxlinfo.c index b7327c92711e..3d2aaf85d962 100644 --- a/third_party/jpeg-xl/examples/jxlinfo.c +++ b/third_party/jpeg-xl/examples/jxlinfo.c @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // This example prints information from the main codestream header. diff --git a/third_party/jpeg-xl/js-wasm-wrapper.sh b/third_party/jpeg-xl/js-wasm-wrapper.sh index fd1ee9843945..fb91c5578ced 100755 --- a/third_party/jpeg-xl/js-wasm-wrapper.sh +++ b/third_party/jpeg-xl/js-wasm-wrapper.sh @@ -1,17 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Continuous integration helper module. This module is meant to be called from # the .gitlab-ci.yml file during the continuous integration build, as well as diff --git a/third_party/jpeg-xl/lib/CMakeLists.txt b/third_party/jpeg-xl/lib/CMakeLists.txt index f84cbddbfbb3..318c59b77255 100644 --- a/third_party/jpeg-xl/lib/CMakeLists.txt +++ b/third_party/jpeg-xl/lib/CMakeLists.txt @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. set(JPEGXL_MAJOR_VERSION 0) set(JPEGXL_MINOR_VERSION 3) diff --git a/third_party/jpeg-xl/lib/extras/codec.cc b/third_party/jpeg-xl/lib/extras/codec.cc index 72c928af9113..43749fdab2e6 100644 --- a/third_party/jpeg-xl/lib/extras/codec.cc +++ b/third_party/jpeg-xl/lib/extras/codec.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec.h" diff --git a/third_party/jpeg-xl/lib/extras/codec.h b/third_party/jpeg-xl/lib/extras/codec.h index cdbf4ed43f3a..17209fdfe634 100644 --- a/third_party/jpeg-xl/lib/extras/codec.h +++ b/third_party/jpeg-xl/lib/extras/codec.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_H_ #define LIB_EXTRAS_CODEC_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_apng.cc b/third_party/jpeg-xl/lib/extras/codec_apng.cc index 9ba9c0176f50..3e646cb79d80 100644 --- a/third_party/jpeg-xl/lib/extras/codec_apng.cc +++ b/third_party/jpeg-xl/lib/extras/codec_apng.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_apng.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_apng.h b/third_party/jpeg-xl/lib/extras/codec_apng.h index d3a7bbc8e998..53d3bfa2ac55 100644 --- a/third_party/jpeg-xl/lib/extras/codec_apng.h +++ b/third_party/jpeg-xl/lib/extras/codec_apng.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_APNG_H_ #define LIB_EXTRAS_CODEC_APNG_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_exr.cc b/third_party/jpeg-xl/lib/extras/codec_exr.cc index 7700d5c9fd87..efd0c1a12c1f 100644 --- a/third_party/jpeg-xl/lib/extras/codec_exr.cc +++ b/third_party/jpeg-xl/lib/extras/codec_exr.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_exr.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_exr.h b/third_party/jpeg-xl/lib/extras/codec_exr.h index 5a28ccc5dca4..b0da5c5b8e70 100644 --- a/third_party/jpeg-xl/lib/extras/codec_exr.h +++ b/third_party/jpeg-xl/lib/extras/codec_exr.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_EXR_H_ #define LIB_EXTRAS_CODEC_EXR_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_gif.cc b/third_party/jpeg-xl/lib/extras/codec_gif.cc index 98bd16f10f19..6228a585889f 100644 --- a/third_party/jpeg-xl/lib/extras/codec_gif.cc +++ b/third_party/jpeg-xl/lib/extras/codec_gif.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_gif.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_gif.h b/third_party/jpeg-xl/lib/extras/codec_gif.h index af9799512bdb..03e0e5525399 100644 --- a/third_party/jpeg-xl/lib/extras/codec_gif.h +++ b/third_party/jpeg-xl/lib/extras/codec_gif.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_GIF_H_ #define LIB_EXTRAS_CODEC_GIF_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_jpg.cc b/third_party/jpeg-xl/lib/extras/codec_jpg.cc index eefc3d0dbc69..3614eb3c4348 100644 --- a/third_party/jpeg-xl/lib/extras/codec_jpg.cc +++ b/third_party/jpeg-xl/lib/extras/codec_jpg.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_jpg.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_jpg.h b/third_party/jpeg-xl/lib/extras/codec_jpg.h index b08f071d2a9f..84041ac86fa7 100644 --- a/third_party/jpeg-xl/lib/extras/codec_jpg.h +++ b/third_party/jpeg-xl/lib/extras/codec_jpg.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_JPG_H_ #define LIB_EXTRAS_CODEC_JPG_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_pgx.cc b/third_party/jpeg-xl/lib/extras/codec_pgx.cc index 491f22dcf207..7904cfb4d029 100644 --- a/third_party/jpeg-xl/lib/extras/codec_pgx.cc +++ b/third_party/jpeg-xl/lib/extras/codec_pgx.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_pgx.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_pgx.h b/third_party/jpeg-xl/lib/extras/codec_pgx.h index 328214b47c86..deb76da0e49a 100644 --- a/third_party/jpeg-xl/lib/extras/codec_pgx.h +++ b/third_party/jpeg-xl/lib/extras/codec_pgx.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_PGX_H_ #define LIB_EXTRAS_CODEC_PGX_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_png.cc b/third_party/jpeg-xl/lib/extras/codec_png.cc index e176992134e6..143a663b1ac9 100644 --- a/third_party/jpeg-xl/lib/extras/codec_png.cc +++ b/third_party/jpeg-xl/lib/extras/codec_png.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_png.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_png.h b/third_party/jpeg-xl/lib/extras/codec_png.h index c86bc74eb2f8..ca5c76fadf98 100644 --- a/third_party/jpeg-xl/lib/extras/codec_png.h +++ b/third_party/jpeg-xl/lib/extras/codec_png.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_PNG_H_ #define LIB_EXTRAS_CODEC_PNG_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_pnm.cc b/third_party/jpeg-xl/lib/extras/codec_pnm.cc index 439b1ef67dcf..506e83bf580b 100644 --- a/third_party/jpeg-xl/lib/extras/codec_pnm.cc +++ b/third_party/jpeg-xl/lib/extras/codec_pnm.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_pnm.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_pnm.h b/third_party/jpeg-xl/lib/extras/codec_pnm.h index 750083d70083..9547ecc9296f 100644 --- a/third_party/jpeg-xl/lib/extras/codec_pnm.h +++ b/third_party/jpeg-xl/lib/extras/codec_pnm.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_PNM_H_ #define LIB_EXTRAS_CODEC_PNM_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_psd.cc b/third_party/jpeg-xl/lib/extras/codec_psd.cc index 8b7fa0e9a635..e868436bd141 100644 --- a/third_party/jpeg-xl/lib/extras/codec_psd.cc +++ b/third_party/jpeg-xl/lib/extras/codec_psd.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec_psd.h" diff --git a/third_party/jpeg-xl/lib/extras/codec_psd.h b/third_party/jpeg-xl/lib/extras/codec_psd.h index d98a8e9241c4..11a9fb882eeb 100644 --- a/third_party/jpeg-xl/lib/extras/codec_psd.h +++ b/third_party/jpeg-xl/lib/extras/codec_psd.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_CODEC_PSD_H_ #define LIB_EXTRAS_CODEC_PSD_H_ diff --git a/third_party/jpeg-xl/lib/extras/codec_test.cc b/third_party/jpeg-xl/lib/extras/codec_test.cc index 11593c3a818a..24426444fb7c 100644 --- a/third_party/jpeg-xl/lib/extras/codec_test.cc +++ b/third_party/jpeg-xl/lib/extras/codec_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/codec.h" diff --git a/third_party/jpeg-xl/lib/extras/tone_mapping.cc b/third_party/jpeg-xl/lib/extras/tone_mapping.cc index 8fcc58597d5a..9bb1c0559c6f 100644 --- a/third_party/jpeg-xl/lib/extras/tone_mapping.cc +++ b/third_party/jpeg-xl/lib/extras/tone_mapping.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/extras/tone_mapping.h" diff --git a/third_party/jpeg-xl/lib/extras/tone_mapping.h b/third_party/jpeg-xl/lib/extras/tone_mapping.h index 886223739063..4f9feeccc6cd 100644 --- a/third_party/jpeg-xl/lib/extras/tone_mapping.h +++ b/third_party/jpeg-xl/lib/extras/tone_mapping.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_EXTRAS_TONE_MAPPING_H_ #define LIB_EXTRAS_TONE_MAPPING_H_ diff --git a/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc b/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc index d73b8fb82a25..c87c9fcc2197 100644 --- a/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc +++ b/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "benchmark/benchmark.h" #include "lib/extras/codec.h" diff --git a/third_party/jpeg-xl/lib/include/jxl/butteraugli.h b/third_party/jpeg-xl/lib/include/jxl/butteraugli.h index 2681bb5660cf..f543413b8c1e 100644 --- a/third_party/jpeg-xl/lib/include/jxl/butteraugli.h +++ b/third_party/jpeg-xl/lib/include/jxl/butteraugli.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file butteraugli.h diff --git a/third_party/jpeg-xl/lib/include/jxl/butteraugli_cxx.h b/third_party/jpeg-xl/lib/include/jxl/butteraugli_cxx.h index 8fa236fa0953..c0e93ad74a27 100644 --- a/third_party/jpeg-xl/lib/include/jxl/butteraugli_cxx.h +++ b/third_party/jpeg-xl/lib/include/jxl/butteraugli_cxx.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. /// @file butteraugli_cxx.h /// @brief C++ header-only helper for @ref butteraugli.h. diff --git a/third_party/jpeg-xl/lib/include/jxl/codestream_header.h b/third_party/jpeg-xl/lib/include/jxl/codestream_header.h index bf084ee54279..04e40d11d960 100644 --- a/third_party/jpeg-xl/lib/include/jxl/codestream_header.h +++ b/third_party/jpeg-xl/lib/include/jxl/codestream_header.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file codestream_header.h diff --git a/third_party/jpeg-xl/lib/include/jxl/color_encoding.h b/third_party/jpeg-xl/lib/include/jxl/color_encoding.h index 818463082d37..08561dc8e389 100644 --- a/third_party/jpeg-xl/lib/include/jxl/color_encoding.h +++ b/third_party/jpeg-xl/lib/include/jxl/color_encoding.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file color_encoding.h diff --git a/third_party/jpeg-xl/lib/include/jxl/decode.h b/third_party/jpeg-xl/lib/include/jxl/decode.h index 27c747123818..becf03e9f956 100644 --- a/third_party/jpeg-xl/lib/include/jxl/decode.h +++ b/third_party/jpeg-xl/lib/include/jxl/decode.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file decode.h @@ -199,8 +190,6 @@ typedef enum { * frame, decoded. This event can only happen if the image has a preview * frame encoded. This event occurs max once for the codestream and always * later than JXL_DEC_COLOR_ENCODING and before JXL_DEC_FRAME. - * This event is different than JXL_DEC_PREVIEW_HEADER because the latter only - * outputs the dimensions of the preview image. */ JXL_DEC_PREVIEW_IMAGE = 0x200, diff --git a/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h b/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h index 0fba691c07e1..4e7315289ccf 100644 --- a/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h +++ b/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. /// @file decode_cxx.h /// @brief C++ header-only helper for @ref decode.h. diff --git a/third_party/jpeg-xl/lib/include/jxl/encode.h b/third_party/jpeg-xl/lib/include/jxl/encode.h index d85cbb96705a..fa23ada91f11 100644 --- a/third_party/jpeg-xl/lib/include/jxl/encode.h +++ b/third_party/jpeg-xl/lib/include/jxl/encode.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file encode.h diff --git a/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h b/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h index a5a963044ff2..841528f57cba 100644 --- a/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h +++ b/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. /// @file encode_cxx.h /// @brief C++ header-only helper for @ref encode.h. diff --git a/third_party/jpeg-xl/lib/include/jxl/memory_manager.h b/third_party/jpeg-xl/lib/include/jxl/memory_manager.h index 6826ffbed913..30e6f9000dcb 100644 --- a/third_party/jpeg-xl/lib/include/jxl/memory_manager.h +++ b/third_party/jpeg-xl/lib/include/jxl/memory_manager.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file memory_manager.h diff --git a/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h b/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h index 0532ea01d342..3411c994d108 100644 --- a/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h +++ b/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** diff --git a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h b/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h index e052273e0486..c3d8308e0cd5 100644 --- a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h +++ b/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file thread_parallel_runner.h diff --git a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h b/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h index 30ed579521a0..121c556130a3 100644 --- a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h +++ b/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. /// @file thread_parallel_runner_cxx.h /// @brief C++ header-only helper for @ref thread_parallel_runner.h. diff --git a/third_party/jpeg-xl/lib/include/jxl/types.h b/third_party/jpeg-xl/lib/include/jxl/types.h index 797a7d4b3c2e..58ade6434796 100644 --- a/third_party/jpeg-xl/lib/include/jxl/types.h +++ b/third_party/jpeg-xl/lib/include/jxl/types.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ /** @file types.h diff --git a/third_party/jpeg-xl/lib/jxl.cmake b/third_party/jpeg-xl/lib/jxl.cmake index 82cbae0c853c..143ad9149ed8 100644 --- a/third_party/jpeg-xl/lib/jxl.cmake +++ b/third_party/jpeg-xl/lib/jxl.cmake @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Lists all source files for the JPEG XL decoder library. These are also used # by the encoder: the encoder uses both dec and enc ourse files, while the diff --git a/third_party/jpeg-xl/lib/jxl/ac_context.h b/third_party/jpeg-xl/lib/jxl/ac_context.h index a5822d2043c6..a2b9e046d118 100644 --- a/third_party/jpeg-xl/lib/jxl/ac_context.h +++ b/third_party/jpeg-xl/lib/jxl/ac_context.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_AC_CONTEXT_H_ #define LIB_JXL_AC_CONTEXT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/ac_strategy.cc b/third_party/jpeg-xl/lib/jxl/ac_strategy.cc index 7da56e8e5064..f262f333196b 100644 --- a/third_party/jpeg-xl/lib/jxl/ac_strategy.cc +++ b/third_party/jpeg-xl/lib/jxl/ac_strategy.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/ac_strategy.h" diff --git a/third_party/jpeg-xl/lib/jxl/ac_strategy.h b/third_party/jpeg-xl/lib/jxl/ac_strategy.h index eb89d2daf7cb..b51564594c1d 100644 --- a/third_party/jpeg-xl/lib/jxl/ac_strategy.h +++ b/third_party/jpeg-xl/lib/jxl/ac_strategy.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_AC_STRATEGY_H_ #define LIB_JXL_AC_STRATEGY_H_ diff --git a/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc b/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc index 5990eebee7b0..e4ceb88b43ae 100644 --- a/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc +++ b/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/ac_strategy.h" diff --git a/third_party/jpeg-xl/lib/jxl/adaptive_reconstruction_test.cc b/third_party/jpeg-xl/lib/jxl/adaptive_reconstruction_test.cc index d157a572b117..6284422f5f57 100644 --- a/third_party/jpeg-xl/lib/jxl/adaptive_reconstruction_test.cc +++ b/third_party/jpeg-xl/lib/jxl/adaptive_reconstruction_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/alpha.cc b/third_party/jpeg-xl/lib/jxl/alpha.cc index bbaea7457ff1..77ac9021d769 100644 --- a/third_party/jpeg-xl/lib/jxl/alpha.cc +++ b/third_party/jpeg-xl/lib/jxl/alpha.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/alpha.h" diff --git a/third_party/jpeg-xl/lib/jxl/alpha.h b/third_party/jpeg-xl/lib/jxl/alpha.h index 848149c103cd..efb76c800f86 100644 --- a/third_party/jpeg-xl/lib/jxl/alpha.h +++ b/third_party/jpeg-xl/lib/jxl/alpha.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ALPHA_H_ #define LIB_JXL_ALPHA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/alpha_test.cc b/third_party/jpeg-xl/lib/jxl/alpha_test.cc index 68d71b2895f2..d90bbd37d97f 100644 --- a/third_party/jpeg-xl/lib/jxl/alpha_test.cc +++ b/third_party/jpeg-xl/lib/jxl/alpha_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/alpha.h" diff --git a/third_party/jpeg-xl/lib/jxl/ans_common.cc b/third_party/jpeg-xl/lib/jxl/ans_common.cc index 12e2b84344d6..cc0d58b4462f 100644 --- a/third_party/jpeg-xl/lib/jxl/ans_common.cc +++ b/third_party/jpeg-xl/lib/jxl/ans_common.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/ans_common.h" diff --git a/third_party/jpeg-xl/lib/jxl/ans_common.h b/third_party/jpeg-xl/lib/jxl/ans_common.h index ed8de099100c..c172165c9e46 100644 --- a/third_party/jpeg-xl/lib/jxl/ans_common.h +++ b/third_party/jpeg-xl/lib/jxl/ans_common.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ANS_COMMON_H_ #define LIB_JXL_ANS_COMMON_H_ diff --git a/third_party/jpeg-xl/lib/jxl/ans_common_test.cc b/third_party/jpeg-xl/lib/jxl/ans_common_test.cc index 4f9e1b8bb3ec..1960c795ad51 100644 --- a/third_party/jpeg-xl/lib/jxl/ans_common_test.cc +++ b/third_party/jpeg-xl/lib/jxl/ans_common_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/ans_common.h" diff --git a/third_party/jpeg-xl/lib/jxl/ans_params.h b/third_party/jpeg-xl/lib/jxl/ans_params.h index 43a5b7c096f5..4bbc284c0bf4 100644 --- a/third_party/jpeg-xl/lib/jxl/ans_params.h +++ b/third_party/jpeg-xl/lib/jxl/ans_params.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ANS_PARAMS_H_ #define LIB_JXL_ANS_PARAMS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/ans_test.cc b/third_party/jpeg-xl/lib/jxl/ans_test.cc index 6ab94008e58a..808c5f3aaa51 100644 --- a/third_party/jpeg-xl/lib/jxl/ans_test.cc +++ b/third_party/jpeg-xl/lib/jxl/ans_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/aux_out.cc b/third_party/jpeg-xl/lib/jxl/aux_out.cc index d0b9d97aa383..e83140d50bfb 100644 --- a/third_party/jpeg-xl/lib/jxl/aux_out.cc +++ b/third_party/jpeg-xl/lib/jxl/aux_out.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/aux_out.h" diff --git a/third_party/jpeg-xl/lib/jxl/aux_out.h b/third_party/jpeg-xl/lib/jxl/aux_out.h index 95e632fb3bad..5baf5bbc28e8 100644 --- a/third_party/jpeg-xl/lib/jxl/aux_out.h +++ b/third_party/jpeg-xl/lib/jxl/aux_out.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_AUX_OUT_H_ #define LIB_JXL_AUX_OUT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/aux_out_fwd.h b/third_party/jpeg-xl/lib/jxl/aux_out_fwd.h index 5f7639aec7e3..29b31ad87a6c 100644 --- a/third_party/jpeg-xl/lib/jxl/aux_out_fwd.h +++ b/third_party/jpeg-xl/lib/jxl/aux_out_fwd.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_AUX_OUT_FWD_H_ #define LIB_JXL_AUX_OUT_FWD_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/arch_macros.h b/third_party/jpeg-xl/lib/jxl/base/arch_macros.h index 3adae2c835a3..a98301915e5b 100644 --- a/third_party/jpeg-xl/lib/jxl/base/arch_macros.h +++ b/third_party/jpeg-xl/lib/jxl/base/arch_macros.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_ARCH_MACROS_H_ #define LIB_JXL_BASE_ARCH_MACROS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/bits.h b/third_party/jpeg-xl/lib/jxl/base/bits.h index 9f15daffdb56..9f86118e7247 100644 --- a/third_party/jpeg-xl/lib/jxl/base/bits.h +++ b/third_party/jpeg-xl/lib/jxl/base/bits.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_BITS_H_ #define LIB_JXL_BASE_BITS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/byte_order.h b/third_party/jpeg-xl/lib/jxl/base/byte_order.h index 5c5b9969a547..f27017d66110 100644 --- a/third_party/jpeg-xl/lib/jxl/base/byte_order.h +++ b/third_party/jpeg-xl/lib/jxl/base/byte_order.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_BYTE_ORDER_H_ #define LIB_JXL_BASE_BYTE_ORDER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/cache_aligned.cc b/third_party/jpeg-xl/lib/jxl/base/cache_aligned.cc index a16d759cba50..35ee2aee0614 100644 --- a/third_party/jpeg-xl/lib/jxl/base/cache_aligned.cc +++ b/third_party/jpeg-xl/lib/jxl/base/cache_aligned.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/cache_aligned.h" diff --git a/third_party/jpeg-xl/lib/jxl/base/cache_aligned.h b/third_party/jpeg-xl/lib/jxl/base/cache_aligned.h index fe70c21fbea0..e57df14837a6 100644 --- a/third_party/jpeg-xl/lib/jxl/base/cache_aligned.h +++ b/third_party/jpeg-xl/lib/jxl/base/cache_aligned.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_CACHE_ALIGNED_H_ #define LIB_JXL_BASE_CACHE_ALIGNED_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h b/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h index 135de43de9e3..6844971da2b5 100644 --- a/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h +++ b/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_COMPILER_SPECIFIC_H_ #define LIB_JXL_BASE_COMPILER_SPECIFIC_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/data_parallel.cc b/third_party/jpeg-xl/lib/jxl/base/data_parallel.cc index fb1692df208a..16b99f1a9fab 100644 --- a/third_party/jpeg-xl/lib/jxl/base/data_parallel.cc +++ b/third_party/jpeg-xl/lib/jxl/base/data_parallel.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/data_parallel.h" diff --git a/third_party/jpeg-xl/lib/jxl/base/data_parallel.h b/third_party/jpeg-xl/lib/jxl/base/data_parallel.h index 9a47a59fdaf9..58dc0e72f769 100644 --- a/third_party/jpeg-xl/lib/jxl/base/data_parallel.h +++ b/third_party/jpeg-xl/lib/jxl/base/data_parallel.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_DATA_PARALLEL_H_ #define LIB_JXL_BASE_DATA_PARALLEL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.cc b/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.cc index 4414571d1700..9303f2c77632 100644 --- a/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.cc +++ b/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/descriptive_statistics.h" diff --git a/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.h b/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.h index 9e70a2facea6..0d1e4850e12c 100644 --- a/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.h +++ b/third_party/jpeg-xl/lib/jxl/base/descriptive_statistics.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_DESCRIPTIVE_STATISTICS_H_ #define LIB_JXL_BASE_DESCRIPTIVE_STATISTICS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/file_io.h b/third_party/jpeg-xl/lib/jxl/base/file_io.h index c3529f82b6f9..2ecf854e1b39 100644 --- a/third_party/jpeg-xl/lib/jxl/base/file_io.h +++ b/third_party/jpeg-xl/lib/jxl/base/file_io.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_FILE_IO_H_ #define LIB_JXL_BASE_FILE_IO_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/iaca.h b/third_party/jpeg-xl/lib/jxl/base/iaca.h index aad6f5d4e4d2..e5732dae5c81 100644 --- a/third_party/jpeg-xl/lib/jxl/base/iaca.h +++ b/third_party/jpeg-xl/lib/jxl/base/iaca.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_IACA_H_ #define LIB_JXL_BASE_IACA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/os_macros.h b/third_party/jpeg-xl/lib/jxl/base/os_macros.h index c1ce5451ea71..b230f2675873 100644 --- a/third_party/jpeg-xl/lib/jxl/base/os_macros.h +++ b/third_party/jpeg-xl/lib/jxl/base/os_macros.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_OS_MACROS_H_ #define LIB_JXL_BASE_OS_MACROS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/override.h b/third_party/jpeg-xl/lib/jxl/base/override.h index 3b1f0b8b4dde..1f8b65797486 100644 --- a/third_party/jpeg-xl/lib/jxl/base/override.h +++ b/third_party/jpeg-xl/lib/jxl/base/override.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_OVERRIDE_H_ #define LIB_JXL_BASE_OVERRIDE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/padded_bytes.cc b/third_party/jpeg-xl/lib/jxl/base/padded_bytes.cc index 055d10418c56..11e4bff6fe0b 100644 --- a/third_party/jpeg-xl/lib/jxl/base/padded_bytes.cc +++ b/third_party/jpeg-xl/lib/jxl/base/padded_bytes.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/padded_bytes.h" diff --git a/third_party/jpeg-xl/lib/jxl/base/padded_bytes.h b/third_party/jpeg-xl/lib/jxl/base/padded_bytes.h index b40b119431ac..1840a6c936ca 100644 --- a/third_party/jpeg-xl/lib/jxl/base/padded_bytes.h +++ b/third_party/jpeg-xl/lib/jxl/base/padded_bytes.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_PADDED_BYTES_H_ #define LIB_JXL_BASE_PADDED_BYTES_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/profiler.h b/third_party/jpeg-xl/lib/jxl/base/profiler.h index b641eb04be46..13f95d2b7a28 100644 --- a/third_party/jpeg-xl/lib/jxl/base/profiler.h +++ b/third_party/jpeg-xl/lib/jxl/base/profiler.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_PROFILER_H_ #define LIB_JXL_BASE_PROFILER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/robust_statistics.h b/third_party/jpeg-xl/lib/jxl/base/robust_statistics.h index 5efddfd691b4..4e6445b7f998 100644 --- a/third_party/jpeg-xl/lib/jxl/base/robust_statistics.h +++ b/third_party/jpeg-xl/lib/jxl/base/robust_statistics.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_ROBUST_STATISTICS_H_ #define LIB_JXL_BASE_ROBUST_STATISTICS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/span.h b/third_party/jpeg-xl/lib/jxl/base/span.h index 12e58e20ab92..f9e59b3710d8 100644 --- a/third_party/jpeg-xl/lib/jxl/base/span.h +++ b/third_party/jpeg-xl/lib/jxl/base/span.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_SPAN_H_ #define LIB_JXL_BASE_SPAN_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/status.cc b/third_party/jpeg-xl/lib/jxl/base/status.cc index 3927b95bda84..9a9434591267 100644 --- a/third_party/jpeg-xl/lib/jxl/base/status.cc +++ b/third_party/jpeg-xl/lib/jxl/base/status.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/status.h" diff --git a/third_party/jpeg-xl/lib/jxl/base/status.h b/third_party/jpeg-xl/lib/jxl/base/status.h index 5c675a8f6a32..51b8bd971811 100644 --- a/third_party/jpeg-xl/lib/jxl/base/status.h +++ b/third_party/jpeg-xl/lib/jxl/base/status.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_STATUS_H_ #define LIB_JXL_BASE_STATUS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/thread_pool_internal.h b/third_party/jpeg-xl/lib/jxl/base/thread_pool_internal.h index 307ae06deb3d..6e23a335a7dd 100644 --- a/third_party/jpeg-xl/lib/jxl/base/thread_pool_internal.h +++ b/third_party/jpeg-xl/lib/jxl/base/thread_pool_internal.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_THREAD_POOL_INTERNAL_H_ #define LIB_JXL_BASE_THREAD_POOL_INTERNAL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/base/time.cc b/third_party/jpeg-xl/lib/jxl/base/time.cc index 6ef2295bf7e6..4aa0c2409b38 100644 --- a/third_party/jpeg-xl/lib/jxl/base/time.cc +++ b/third_party/jpeg-xl/lib/jxl/base/time.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/time.h" diff --git a/third_party/jpeg-xl/lib/jxl/base/time.h b/third_party/jpeg-xl/lib/jxl/base/time.h index 8dc6f3657f39..03cf901576dc 100644 --- a/third_party/jpeg-xl/lib/jxl/base/time.h +++ b/third_party/jpeg-xl/lib/jxl/base/time.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BASE_TIME_H_ #define LIB_JXL_BASE_TIME_H_ diff --git a/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc b/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc index 88cee95095c3..c962853190c9 100644 --- a/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc +++ b/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/bits_test.cc b/third_party/jpeg-xl/lib/jxl/bits_test.cc index 132bcb5535c6..9c109cb7721f 100644 --- a/third_party/jpeg-xl/lib/jxl/bits_test.cc +++ b/third_party/jpeg-xl/lib/jxl/bits_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/bits.h" diff --git a/third_party/jpeg-xl/lib/jxl/blending.cc b/third_party/jpeg-xl/lib/jxl/blending.cc index eecca973ff4e..eeb118fca2bf 100644 --- a/third_party/jpeg-xl/lib/jxl/blending.cc +++ b/third_party/jpeg-xl/lib/jxl/blending.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/blending.h" diff --git a/third_party/jpeg-xl/lib/jxl/blending.h b/third_party/jpeg-xl/lib/jxl/blending.h index 8ec30faa6d9b..8643f17416e0 100644 --- a/third_party/jpeg-xl/lib/jxl/blending.h +++ b/third_party/jpeg-xl/lib/jxl/blending.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_BLENDING_H_ #define LIB_JXL_BLENDING_H_ diff --git a/third_party/jpeg-xl/lib/jxl/blending_test.cc b/third_party/jpeg-xl/lib/jxl/blending_test.cc index 1e5cdf7bef1c..e5d50c727050 100644 --- a/third_party/jpeg-xl/lib/jxl/blending_test.cc +++ b/third_party/jpeg-xl/lib/jxl/blending_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/blending.h" diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc index ae7a06c30be3..3ce31cab80a7 100644 --- a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc +++ b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // // Author: Jyrki Alakuijala (jyrki.alakuijala@gmail.com) // diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h index 68d3ac107452..d029722d132e 100644 --- a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h +++ b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // // Author: Jyrki Alakuijala (jyrki.alakuijala@gmail.com) diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli_test.cc b/third_party/jpeg-xl/lib/jxl/butteraugli_test.cc index bab700ebc206..98ec7888aaeb 100644 --- a/third_party/jpeg-xl/lib/jxl/butteraugli_test.cc +++ b/third_party/jpeg-xl/lib/jxl/butteraugli_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "jxl/butteraugli.h" diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli_wrapper.cc b/third_party/jpeg-xl/lib/jxl/butteraugli_wrapper.cc index 6c6b8ec12313..a2d2bc3c934a 100644 --- a/third_party/jpeg-xl/lib/jxl/butteraugli_wrapper.cc +++ b/third_party/jpeg-xl/lib/jxl/butteraugli_wrapper.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/byte_order_test.cc b/third_party/jpeg-xl/lib/jxl/byte_order_test.cc index 3673893cf30e..c1ea19f312f8 100644 --- a/third_party/jpeg-xl/lib/jxl/byte_order_test.cc +++ b/third_party/jpeg-xl/lib/jxl/byte_order_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/byte_order.h" diff --git a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc b/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc index 8d2c9b7b51a0..63d21cbb4b5b 100644 --- a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc +++ b/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/chroma_from_luma.h" diff --git a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h b/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h index c73d1d1b0b5f..cf2f90e43ded 100644 --- a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h +++ b/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_CHROMA_FROM_LUMA_H_ #define LIB_JXL_CHROMA_FROM_LUMA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/codec_in_out.h b/third_party/jpeg-xl/lib/jxl/codec_in_out.h index 603ad2492d19..e33c06f9d2e2 100644 --- a/third_party/jpeg-xl/lib/jxl/codec_in_out.h +++ b/third_party/jpeg-xl/lib/jxl/codec_in_out.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_CODEC_IN_OUT_H_ #define LIB_JXL_CODEC_IN_OUT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order.cc b/third_party/jpeg-xl/lib/jxl/coeff_order.cc index 0a2a09613601..e87728339de6 100644 --- a/third_party/jpeg-xl/lib/jxl/coeff_order.cc +++ b/third_party/jpeg-xl/lib/jxl/coeff_order.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/coeff_order.h" diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order.h b/third_party/jpeg-xl/lib/jxl/coeff_order.h index a1dc927ba5fd..c600b7b3bfb8 100644 --- a/third_party/jpeg-xl/lib/jxl/coeff_order.h +++ b/third_party/jpeg-xl/lib/jxl/coeff_order.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_COEFF_ORDER_H_ #define LIB_JXL_COEFF_ORDER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h b/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h index 8ae76e839239..700e9a83d419 100644 --- a/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h +++ b/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_COEFF_ORDER_FWD_H_ #define LIB_JXL_COEFF_ORDER_FWD_H_ diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc b/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc index 7551de672861..2408905001ae 100644 --- a/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc +++ b/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/coeff_order.h" diff --git a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc b/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc index 8ddbec505f71..925ac8690144 100644 --- a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc +++ b/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/color_encoding_internal.h" diff --git a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h b/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h index 651ebc26d0fc..6313b2953c23 100644 --- a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h +++ b/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_COLOR_ENCODING_INTERNAL_H_ #define LIB_JXL_COLOR_ENCODING_INTERNAL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc b/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc index f0a8ca3911ce..16393813aacb 100644 --- a/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc +++ b/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/color_encoding_internal.h" diff --git a/third_party/jpeg-xl/lib/jxl/color_management.cc b/third_party/jpeg-xl/lib/jxl/color_management.cc index 232ee88b3bb6..3f4f904e1952 100644 --- a/third_party/jpeg-xl/lib/jxl/color_management.cc +++ b/third_party/jpeg-xl/lib/jxl/color_management.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Defined by build system; this avoids IDE warnings. Must come before // color_management.h (affects header definitions). diff --git a/third_party/jpeg-xl/lib/jxl/color_management.h b/third_party/jpeg-xl/lib/jxl/color_management.h index ddfa49cf0b5f..f728fe589a25 100644 --- a/third_party/jpeg-xl/lib/jxl/color_management.h +++ b/third_party/jpeg-xl/lib/jxl/color_management.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_COLOR_MANAGEMENT_H_ #define LIB_JXL_COLOR_MANAGEMENT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/color_management_test.cc b/third_party/jpeg-xl/lib/jxl/color_management_test.cc index db65925351a1..0747e5c9e3a7 100644 --- a/third_party/jpeg-xl/lib/jxl/color_management_test.cc +++ b/third_party/jpeg-xl/lib/jxl/color_management_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/color_management.h" diff --git a/third_party/jpeg-xl/lib/jxl/common.h b/third_party/jpeg-xl/lib/jxl/common.h index f140fa63f2b7..c98105965e61 100644 --- a/third_party/jpeg-xl/lib/jxl/common.h +++ b/third_party/jpeg-xl/lib/jxl/common.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_COMMON_H_ #define LIB_JXL_COMMON_H_ diff --git a/third_party/jpeg-xl/lib/jxl/compressed_dc.cc b/third_party/jpeg-xl/lib/jxl/compressed_dc.cc index f1d00e56e551..bac580acaaf0 100644 --- a/third_party/jpeg-xl/lib/jxl/compressed_dc.cc +++ b/third_party/jpeg-xl/lib/jxl/compressed_dc.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/compressed_dc.h" diff --git a/third_party/jpeg-xl/lib/jxl/compressed_dc.h b/third_party/jpeg-xl/lib/jxl/compressed_dc.h index e3d3ad40df04..b06e5931f09a 100644 --- a/third_party/jpeg-xl/lib/jxl/compressed_dc.h +++ b/third_party/jpeg-xl/lib/jxl/compressed_dc.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_COMPRESSED_DC_H_ #define LIB_JXL_COMPRESSED_DC_H_ diff --git a/third_party/jpeg-xl/lib/jxl/compressed_image_test.cc b/third_party/jpeg-xl/lib/jxl/compressed_image_test.cc index eb4cf250a730..754612761622 100644 --- a/third_party/jpeg-xl/lib/jxl/compressed_image_test.cc +++ b/third_party/jpeg-xl/lib/jxl/compressed_image_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/convolve-inl.h b/third_party/jpeg-xl/lib/jxl/convolve-inl.h index 8977156ad4b8..255bb9d05172 100644 --- a/third_party/jpeg-xl/lib/jxl/convolve-inl.h +++ b/third_party/jpeg-xl/lib/jxl/convolve-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #if defined(LIB_JXL_CONVOLVE_INL_H_) == defined(HWY_TARGET_TOGGLE) #ifdef LIB_JXL_CONVOLVE_INL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/convolve.cc b/third_party/jpeg-xl/lib/jxl/convolve.cc index a2c9051eeeb7..cc7fc3f90e97 100644 --- a/third_party/jpeg-xl/lib/jxl/convolve.cc +++ b/third_party/jpeg-xl/lib/jxl/convolve.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/convolve.h" diff --git a/third_party/jpeg-xl/lib/jxl/convolve.h b/third_party/jpeg-xl/lib/jxl/convolve.h index 27bb7990aa82..c2e2ae42fb1f 100644 --- a/third_party/jpeg-xl/lib/jxl/convolve.h +++ b/third_party/jpeg-xl/lib/jxl/convolve.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_CONVOLVE_H_ #define LIB_JXL_CONVOLVE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/convolve_test.cc b/third_party/jpeg-xl/lib/jxl/convolve_test.cc index bd355c55de13..45e7e45f10a9 100644 --- a/third_party/jpeg-xl/lib/jxl/convolve_test.cc +++ b/third_party/jpeg-xl/lib/jxl/convolve_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/convolve.h" diff --git a/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc b/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc index 7d2b14edff78..63db1f8ca035 100644 --- a/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc +++ b/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/data_parallel.h" diff --git a/third_party/jpeg-xl/lib/jxl/dct-inl.h b/third_party/jpeg-xl/lib/jxl/dct-inl.h index 775eb1e90bbe..cacc6c920223 100644 --- a/third_party/jpeg-xl/lib/jxl/dct-inl.h +++ b/third_party/jpeg-xl/lib/jxl/dct-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Fast SIMD floating-point (I)DCT, any power of two. diff --git a/third_party/jpeg-xl/lib/jxl/dct_block-inl.h b/third_party/jpeg-xl/lib/jxl/dct_block-inl.h index 785a0bcbe4b8..50646a737f83 100644 --- a/third_party/jpeg-xl/lib/jxl/dct_block-inl.h +++ b/third_party/jpeg-xl/lib/jxl/dct_block-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Adapters for DCT input/output: from/to contiguous blocks or image rows. diff --git a/third_party/jpeg-xl/lib/jxl/dct_for_test.h b/third_party/jpeg-xl/lib/jxl/dct_for_test.h index 0e4818546723..8e32aa7eff10 100644 --- a/third_party/jpeg-xl/lib/jxl/dct_for_test.h +++ b/third_party/jpeg-xl/lib/jxl/dct_for_test.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DCT_FOR_TEST_H_ #define LIB_JXL_DCT_FOR_TEST_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dct_scales.cc b/third_party/jpeg-xl/lib/jxl/dct_scales.cc index d3f1fb6300ef..f9e89a6014b7 100644 --- a/third_party/jpeg-xl/lib/jxl/dct_scales.cc +++ b/third_party/jpeg-xl/lib/jxl/dct_scales.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dct_scales.h" diff --git a/third_party/jpeg-xl/lib/jxl/dct_scales.h b/third_party/jpeg-xl/lib/jxl/dct_scales.h index 1e7efe7c9b01..9ec670aedc9d 100644 --- a/third_party/jpeg-xl/lib/jxl/dct_scales.h +++ b/third_party/jpeg-xl/lib/jxl/dct_scales.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DCT_SCALES_H_ #define LIB_JXL_DCT_SCALES_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dct_test.cc b/third_party/jpeg-xl/lib/jxl/dct_test.cc index 4b974baef090..a51a3178c9be 100644 --- a/third_party/jpeg-xl/lib/jxl/dct_test.cc +++ b/third_party/jpeg-xl/lib/jxl/dct_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/dct_util.h b/third_party/jpeg-xl/lib/jxl/dct_util.h index 21c471c13354..fb6ce3b9713e 100644 --- a/third_party/jpeg-xl/lib/jxl/dct_util.h +++ b/third_party/jpeg-xl/lib/jxl/dct_util.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DCT_UTIL_H_ #define LIB_JXL_DCT_UTIL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_ans.cc b/third_party/jpeg-xl/lib/jxl/dec_ans.cc index f8f2aa507971..8db56908b335 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_ans.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_ans.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_ans.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_ans.h b/third_party/jpeg-xl/lib/jxl/dec_ans.h index b49a8bc9ce9b..15273a815679 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_ans.h +++ b/third_party/jpeg-xl/lib/jxl/dec_ans.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_ANS_H_ #define LIB_JXL_DEC_ANS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h b/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h index d4f456881351..20b4cd17e3ab 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h +++ b/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_BIT_READER_H_ #define LIB_JXL_DEC_BIT_READER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_cache.h b/third_party/jpeg-xl/lib/jxl/dec_cache.h index 6b55127dfcf4..24ca60255297 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_cache.h +++ b/third_party/jpeg-xl/lib/jxl/dec_cache.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_CACHE_H_ #define LIB_JXL_DEC_CACHE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_context_map.cc b/third_party/jpeg-xl/lib/jxl/dec_context_map.cc index d81caad6c2bd..f7fc3d27a430 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_context_map.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_context_map.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_context_map.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_context_map.h b/third_party/jpeg-xl/lib/jxl/dec_context_map.h index 0e30d3972e1d..1db2317827ec 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_context_map.h +++ b/third_party/jpeg-xl/lib/jxl/dec_context_map.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_CONTEXT_MAP_H_ #define LIB_JXL_DEC_CONTEXT_MAP_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_external_image.cc b/third_party/jpeg-xl/lib/jxl/dec_external_image.cc index b3daea9aae1b..e0b40e91f0e1 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_external_image.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_external_image.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_external_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_external_image.h b/third_party/jpeg-xl/lib/jxl/dec_external_image.h index 540b64b406b6..aed876441134 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_external_image.h +++ b/third_party/jpeg-xl/lib/jxl/dec_external_image.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_EXTERNAL_IMAGE_H_ #define LIB_JXL_DEC_EXTERNAL_IMAGE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc b/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc index 0cbfbc877a34..283a97529ace 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "benchmark/benchmark.h" #include "lib/jxl/dec_external_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_file.cc b/third_party/jpeg-xl/lib/jxl/dec_file.cc index f33cfe17212f..4f5c7f07e2cc 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_file.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_file.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_file.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_file.h b/third_party/jpeg-xl/lib/jxl/dec_file.h index 2077ce02c8db..cd04d5d4c737 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_file.h +++ b/third_party/jpeg-xl/lib/jxl/dec_file.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_FILE_H_ #define LIB_JXL_DEC_FILE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_frame.cc b/third_party/jpeg-xl/lib/jxl/dec_frame.cc index f4897ee1345a..7a1c1b8660a7 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_frame.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_frame.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_frame.h" @@ -371,6 +362,8 @@ Status FrameDecoder::ProcessDCGlobal(BitReader* br) { } } } + } else { + shared.image_features.patches.Clear(); } if (shared.frame_header.flags & FrameHeader::kSplines) { JXL_RETURN_IF_ERROR(shared.image_features.splines.Decode( diff --git a/third_party/jpeg-xl/lib/jxl/dec_frame.h b/third_party/jpeg-xl/lib/jxl/dec_frame.h index 4872869b46a2..cdecab64ab34 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_frame.h +++ b/third_party/jpeg-xl/lib/jxl/dec_frame.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_FRAME_H_ #define LIB_JXL_DEC_FRAME_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_group.cc b/third_party/jpeg-xl/lib/jxl/dec_group.cc index 46fc7443626f..d0e522149d1a 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_group.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_group.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_group.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_group.h b/third_party/jpeg-xl/lib/jxl/dec_group.h index 519107883b86..a7b868d3a4dd 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_group.h +++ b/third_party/jpeg-xl/lib/jxl/dec_group.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_GROUP_H_ #define LIB_JXL_DEC_GROUP_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_group_border.cc b/third_party/jpeg-xl/lib/jxl/dec_group_border.cc index 6b587b58cb28..2e08578730dd 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_group_border.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_group_border.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_group_border.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_group_border.h b/third_party/jpeg-xl/lib/jxl/dec_group_border.h index 946b9f6adb30..a6dd5a75843b 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_group_border.h +++ b/third_party/jpeg-xl/lib/jxl/dec_group_border.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_GROUP_BORDER_H_ #define LIB_JXL_DEC_GROUP_BORDER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_huffman.cc b/third_party/jpeg-xl/lib/jxl/dec_huffman.cc index f934c3ec0aba..05b275773afb 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_huffman.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_huffman.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_huffman.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_huffman.h b/third_party/jpeg-xl/lib/jxl/dec_huffman.h index 333c39172a7c..162c3e309c4d 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_huffman.h +++ b/third_party/jpeg-xl/lib/jxl/dec_huffman.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_HUFFMAN_H_ #define LIB_JXL_DEC_HUFFMAN_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_modular.cc b/third_party/jpeg-xl/lib/jxl/dec_modular.cc index 4ac0e5bed4aa..939bc887cf9c 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_modular.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_modular.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_modular.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_modular.h b/third_party/jpeg-xl/lib/jxl/dec_modular.h index 0cf06449651c..7ae2418471e2 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_modular.h +++ b/third_party/jpeg-xl/lib/jxl/dec_modular.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_MODULAR_H_ #define LIB_JXL_DEC_MODULAR_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_noise.cc b/third_party/jpeg-xl/lib/jxl/dec_noise.cc index f010055fd6e3..4fe7f045929f 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_noise.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_noise.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_noise.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_noise.h b/third_party/jpeg-xl/lib/jxl/dec_noise.h index 3ea9d5442f88..f7135e7c5a5a 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_noise.h +++ b/third_party/jpeg-xl/lib/jxl/dec_noise.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_NOISE_H_ #define LIB_JXL_DEC_NOISE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_params.h b/third_party/jpeg-xl/lib/jxl/dec_params.h index f913c86d5ca7..e3131e6cb973 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_params.h +++ b/third_party/jpeg-xl/lib/jxl/dec_params.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_PARAMS_H_ #define LIB_JXL_DEC_PARAMS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc b/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc index 3f4d23a932f4..20f5eea474f9 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_patch_dictionary.h" @@ -48,6 +39,7 @@ constexpr int kMaxPatches = 1 << 24; Status PatchDictionary::Decode(BitReader* br, size_t xsize, size_t ysize, bool* uses_extra_channels) { + positions_.clear(); std::vector context_map; ANSCode code; JXL_RETURN_IF_ERROR( @@ -162,6 +154,8 @@ Status PatchDictionary::Decode(BitReader* br, size_t xsize, size_t ysize, } void PatchDictionary::ComputePatchCache() { + patch_starts_.clear(); + sorted_patches_.clear(); if (positions_.empty()) return; std::vector> sorted_patches_y; for (size_t i = 0; i < positions_.size(); i++) { diff --git a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h b/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h index 3a59f8737ff5..f0b855ebfea9 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h +++ b/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_PATCH_DICTIONARY_H_ #define LIB_JXL_DEC_PATCH_DICTIONARY_H_ @@ -169,6 +160,11 @@ class PatchDictionary { Status Decode(BitReader* br, size_t xsize, size_t ysize, bool* uses_extra_channels); + void Clear() { + positions_.clear(); + ComputePatchCache(); + } + // Only adds patches that belong to the `image_rect` area of the decoded // image, writing them to the `opsin_rect` area of `opsin`. Status AddTo(Image3F* opsin, const Rect& opsin_rect, diff --git a/third_party/jpeg-xl/lib/jxl/dec_reconstruct.cc b/third_party/jpeg-xl/lib/jxl/dec_reconstruct.cc index c92e1b6c77bb..e274b90e59f1 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_reconstruct.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_reconstruct.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_reconstruct.h" @@ -827,8 +818,7 @@ Status FinalizeImageRect( num_ys = upsampled_frame_rect.ysize() - upsampled_available_y; } - Rect upsample_input_rect = - rect_for_upsampling.Lines(input_y, num_input_rows); + Rect upsample_input_rect = rect_for_upsampling.Lines(input_y, 1); color_upsampler->UpsampleRect( *storage_for_if, upsample_input_rect, output_pixel_data_storage, upsampled_frame_rect_for_storage.Lines(upsampled_available_y, num_ys), diff --git a/third_party/jpeg-xl/lib/jxl/dec_reconstruct.h b/third_party/jpeg-xl/lib/jxl/dec_reconstruct.h index 685a86a3e7f8..4fa9179b3796 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_reconstruct.h +++ b/third_party/jpeg-xl/lib/jxl/dec_reconstruct.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_RECONSTRUCT_H_ #define LIB_JXL_DEC_RECONSTRUCT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h b/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h index 40cdbf6a6614..c9aebc6b995f 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h +++ b/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #if defined(LIB_JXL_DEC_TRANSFORMS_INL_H_) == defined(HWY_TARGET_TOGGLE) #ifdef LIB_JXL_DEC_TRANSFORMS_INL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc b/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc index a561026b4ab8..9ee80c59dcb8 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_transforms_testonly.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h b/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h index c8f56398799a..97c4ca543df2 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h +++ b/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_TRANSFORMS_TESTONLY_H_ #define LIB_JXL_DEC_TRANSFORMS_TESTONLY_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_upsample.cc b/third_party/jpeg-xl/lib/jxl/dec_upsample.cc index 666d1eae2117..71b34a0798ef 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_upsample.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_upsample.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_upsample.h" @@ -103,7 +94,7 @@ void Upsampler::UpsampleRect(const ImageF& src, const Rect& src_rect, ssize_t image_y_offset, size_t image_ysize) const { if (upsampling_ == 1) return; JXL_ASSERT(DivCeil(dst_rect.xsize(), upsampling_) <= src_rect.xsize()); - JXL_ASSERT(DivCeil(dst_rect.ysize(), upsampling_) <= src_rect.ysize()); + // TODO(eustas): add proper (src|dst) ysize check that accounts for mirroring. if (upsampling_ == 2) { Upsample<2>(src, src_rect, dst, dst_rect, kernel_, image_y_offset, image_ysize); diff --git a/third_party/jpeg-xl/lib/jxl/dec_upsample.h b/third_party/jpeg-xl/lib/jxl/dec_upsample.h index afc2fb364ef4..3a59844effa7 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_upsample.h +++ b/third_party/jpeg-xl/lib/jxl/dec_upsample.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_UPSAMPLE_H_ #define LIB_JXL_DEC_UPSAMPLE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h b/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h index d80cbbe40aab..31e42495ac42 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h +++ b/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // XYB -> linear sRGB helper function. diff --git a/third_party/jpeg-xl/lib/jxl/dec_xyb.cc b/third_party/jpeg-xl/lib/jxl/dec_xyb.cc index 134673553fb4..f1513a738b7b 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_xyb.cc +++ b/third_party/jpeg-xl/lib/jxl/dec_xyb.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/dec_xyb.h" diff --git a/third_party/jpeg-xl/lib/jxl/dec_xyb.h b/third_party/jpeg-xl/lib/jxl/dec_xyb.h index a7662eb93b4c..479a9bb11184 100644 --- a/third_party/jpeg-xl/lib/jxl/dec_xyb.h +++ b/third_party/jpeg-xl/lib/jxl/dec_xyb.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_DEC_XYB_H_ #define LIB_JXL_DEC_XYB_H_ diff --git a/third_party/jpeg-xl/lib/jxl/decode.cc b/third_party/jpeg-xl/lib/jxl/decode.cc index 560aa0b175f5..447e547c5305 100644 --- a/third_party/jpeg-xl/lib/jxl/decode.cc +++ b/third_party/jpeg-xl/lib/jxl/decode.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "jxl/decode.h" @@ -1974,10 +1965,16 @@ JxlDecoderStatus JxlDecoderFlushImage(JxlDecoder* dec) { return JXL_DEC_SUCCESS; } + // Temporarily shrink `dec->ib` to the actual size of the full image to call + // ConvertImageInternal. + size_t xsize = dec->ib->xsize(); + size_t ysize = dec->ib->ysize(); + dec->ib->ShrinkTo(dec->metadata.size.xsize(), dec->metadata.size.ysize()); JxlDecoderStatus status = jxl::ConvertImageInternal( dec, *dec->ib, dec->image_out_format, dec->image_out_buffer, dec->image_out_size, /*out_callback=*/nullptr, /*out_opaque=*/nullptr); + dec->ib->ShrinkTo(xsize, ysize); if (status != JXL_DEC_SUCCESS) return status; return JXL_DEC_SUCCESS; } diff --git a/third_party/jpeg-xl/lib/jxl/decode_test.cc b/third_party/jpeg-xl/lib/jxl/decode_test.cc index a578e5c6cdcf..33e3a63b432b 100644 --- a/third_party/jpeg-xl/lib/jxl/decode_test.cc +++ b/third_party/jpeg-xl/lib/jxl/decode_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "jxl/decode.h" diff --git a/third_party/jpeg-xl/lib/jxl/descriptive_statistics_test.cc b/third_party/jpeg-xl/lib/jxl/descriptive_statistics_test.cc index d0633f7a5d9f..7891c728e212 100644 --- a/third_party/jpeg-xl/lib/jxl/descriptive_statistics_test.cc +++ b/third_party/jpeg-xl/lib/jxl/descriptive_statistics_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/descriptive_statistics.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc b/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc index af6773595e16..1bfa4b474f12 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_ac_strategy.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h b/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h index fe4f55562478..60e51377011f 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h +++ b/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_AC_STRATEGY_H_ #define LIB_JXL_ENC_AC_STRATEGY_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc b/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc index f8e67bdc706f..23d72c1b8136 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_adaptive_quantization.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h b/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h index f04936f70b7d..d9666f42b1a9 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h +++ b/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_ADAPTIVE_QUANTIZATION_H_ #define LIB_JXL_ENC_ADAPTIVE_QUANTIZATION_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_ans.cc b/third_party/jpeg-xl/lib/jxl/enc_ans.cc index 746ece90d809..236a5f5099d0 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ans.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_ans.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_ans.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_ans.h b/third_party/jpeg-xl/lib/jxl/enc_ans.h index a120ad145b00..9614ede9c663 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ans.h +++ b/third_party/jpeg-xl/lib/jxl/enc_ans.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_ANS_H_ #define LIB_JXL_ENC_ANS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_ans_params.h b/third_party/jpeg-xl/lib/jxl/enc_ans_params.h index c88c84088c12..dad4e709052a 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ans_params.h +++ b/third_party/jpeg-xl/lib/jxl/enc_ans_params.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_ANS_PARAMS_H_ #define LIB_JXL_ENC_ANS_PARAMS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.cc b/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.cc index f11d06c6e8a8..f43340eda43c 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_ar_control_field.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.h b/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.h index 35520f216040..ae9d399b9237 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.h +++ b/third_party/jpeg-xl/lib/jxl/enc_ar_control_field.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_AR_CONTROL_FIELD_H_ #define LIB_JXL_ENC_AR_CONTROL_FIELD_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc b/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc index acc3173a564d..bc686f8cb604 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_bit_writer.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h b/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h index 97e803fc967f..bae51fd06002 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h +++ b/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_BIT_WRITER_H_ #define LIB_JXL_ENC_BIT_WRITER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc index 91b7a4b589be..e25350946637 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_butteraugli_comparator.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h index b9093ac79e47..48a1d8950eb6 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h +++ b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_BUTTERAUGLI_COMPARATOR_H_ #define LIB_JXL_ENC_BUTTERAUGLI_COMPARATOR_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.cc b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.cc index f1430d4d89dc..7c3fb9c2877c 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_butteraugli_pnorm.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.h b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.h index 345ba975584e..5579c0adee54 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.h +++ b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_pnorm.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_BUTTERAUGLI_PNORM_H_ #define LIB_JXL_ENC_BUTTERAUGLI_PNORM_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_cache.cc b/third_party/jpeg-xl/lib/jxl/enc_cache.cc index 10b0e3d12bbf..9c732bc9b6a6 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_cache.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_cache.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_cache.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_cache.h b/third_party/jpeg-xl/lib/jxl/enc_cache.h index ba4710c48bde..b8530f1173d7 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_cache.h +++ b/third_party/jpeg-xl/lib/jxl/enc_cache.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_CACHE_H_ #define LIB_JXL_ENC_CACHE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc b/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc index 4db68afd6098..e5c3f38991a7 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_chroma_from_luma.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h b/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h index ad17f484a5d4..a0977740301e 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h +++ b/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_CHROMA_FROM_LUMA_H_ #define LIB_JXL_ENC_CHROMA_FROM_LUMA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_cluster.cc b/third_party/jpeg-xl/lib/jxl/enc_cluster.cc index eca6014305ec..b3be36b7b880 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_cluster.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_cluster.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_cluster.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_cluster.h b/third_party/jpeg-xl/lib/jxl/enc_cluster.h index 06937d9938be..622a56795024 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_cluster.h +++ b/third_party/jpeg-xl/lib/jxl/enc_cluster.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Functions for clustering similar histograms together. diff --git a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc b/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc index 9399ba253a56..29bc03c18f29 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h b/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h index 67692b4f9ead..5eee7465924c 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h +++ b/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_COEFF_ORDER_H_ #define LIB_JXL_ENC_COEFF_ORDER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_color_management.cc b/third_party/jpeg-xl/lib/jxl/enc_color_management.cc index 73f89ecd7a26..5f7c2ccdacbe 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_color_management.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_color_management.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Defined by build system; this avoids IDE warnings. Must come before // color_management.h (affects header definitions). diff --git a/third_party/jpeg-xl/lib/jxl/enc_color_management.h b/third_party/jpeg-xl/lib/jxl/enc_color_management.h index 8c367f0440c7..ba70d8a7febd 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_color_management.h +++ b/third_party/jpeg-xl/lib/jxl/enc_color_management.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_COLOR_MANAGEMENT_H_ #define LIB_JXL_ENC_COLOR_MANAGEMENT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_comparator.cc b/third_party/jpeg-xl/lib/jxl/enc_comparator.cc index 7fd944321369..f5b25f876a43 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_comparator.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_comparator.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_comparator.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_comparator.h b/third_party/jpeg-xl/lib/jxl/enc_comparator.h index 91437f65a7a5..e348a4e8ebce 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_comparator.h +++ b/third_party/jpeg-xl/lib/jxl/enc_comparator.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_COMPARATOR_H_ #define LIB_JXL_ENC_COMPARATOR_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_context_map.cc b/third_party/jpeg-xl/lib/jxl/enc_context_map.cc index 532cd1303380..4719a254a95b 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_context_map.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_context_map.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Library to encode the context map. diff --git a/third_party/jpeg-xl/lib/jxl/enc_context_map.h b/third_party/jpeg-xl/lib/jxl/enc_context_map.h index 155e8c204bd2..7f6c62438063 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_context_map.h +++ b/third_party/jpeg-xl/lib/jxl/enc_context_map.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_CONTEXT_MAP_H_ #define LIB_JXL_ENC_CONTEXT_MAP_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc b/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc index 9387b063385e..a2285df362f3 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_detect_dots.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h b/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h index 37efdf93dead..6e06a164fd53 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h +++ b/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // We attempt to remove dots, or speckle from images using Gaussian blur. #ifndef LIB_JXL_ENC_DETECT_DOTS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc index 189f84cbb388..40440c4aa4cd 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_dot_dictionary.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h index 06171fdb23da..f89791e4b1e7 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h +++ b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_DOT_DICTIONARY_H_ #define LIB_JXL_ENC_DOT_DICTIONARY_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc b/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc index 20168c6ed307..8a06e3b66d07 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_entropy_coder.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h b/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h index cf546e022d01..7dfc71c72650 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h +++ b/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_ENTROPY_CODER_H_ #define LIB_JXL_ENC_ENTROPY_CODER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image.cc b/third_party/jpeg-xl/lib/jxl/enc_external_image.cc index 48706652be87..f1eb155e7127 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_external_image.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_external_image.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_external_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image.h b/third_party/jpeg-xl/lib/jxl/enc_external_image.h index 6ea321412cee..f943fc54ef31 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_external_image.h +++ b/third_party/jpeg-xl/lib/jxl/enc_external_image.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_EXTERNAL_IMAGE_H_ #define LIB_JXL_ENC_EXTERNAL_IMAGE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc b/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc index 72c8c77588d7..2af942b7f5e6 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "benchmark/benchmark.h" #include "lib/jxl/enc_external_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc b/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc index 13c0debb1cc3..3f3ac8988c64 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_external_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_fast_heuristics.cc b/third_party/jpeg-xl/lib/jxl/enc_fast_heuristics.cc index 517947fb3e7b..16f7670c1ac9 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_fast_heuristics.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_fast_heuristics.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/enc_file.cc b/third_party/jpeg-xl/lib/jxl/enc_file.cc index 0fbf0bee92ce..f4de628f9f1a 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_file.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_file.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_file.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_file.h b/third_party/jpeg-xl/lib/jxl/enc_file.h index 90f9007209b8..f729d7b799da 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_file.h +++ b/third_party/jpeg-xl/lib/jxl/enc_file.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_FILE_H_ #define LIB_JXL_ENC_FILE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_frame.cc b/third_party/jpeg-xl/lib/jxl/enc_frame.cc index e317c30de7f0..614203dc04a7 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_frame.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_frame.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_frame.h" @@ -375,12 +366,12 @@ Status MakeFrameHeader(const CompressParams& cparams, } frame_header->blending_info.alpha_channel = index; frame_header->blending_info.mode = - ib.blend ? BlendMode::kBlend : BlendMode::kReplace; + ib.blend ? ib.blendmode : BlendMode::kReplace; // previous frames are saved with ID 1. frame_header->blending_info.source = 1; for (size_t i = 0; i < extra_channels.size(); i++) { frame_header->extra_channel_blending_info[i].alpha_channel = index; - BlendMode default_blend = BlendMode::kBlend; + BlendMode default_blend = ib.blendmode; if (extra_channels[i].type != ExtraChannel::kBlack && i != index) { // K needs to be blended, spot colors and other stuff gets added default_blend = BlendMode::kAdd; @@ -1018,6 +1009,8 @@ Status EncodeFrame(const CompressParams& cparams_orig, ThreadPool* pool, BitWriter* writer, AuxOut* aux_out) { ib.VerifyMetadata(); + passes_enc_state->special_frames.clear(); + CompressParams cparams = cparams_orig; if (cparams.progressive_dc < 0) { if (cparams.progressive_dc != -1) { diff --git a/third_party/jpeg-xl/lib/jxl/enc_frame.h b/third_party/jpeg-xl/lib/jxl/enc_frame.h index 851a2c0a1102..ba999910868e 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_frame.h +++ b/third_party/jpeg-xl/lib/jxl/enc_frame.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_FRAME_H_ #define LIB_JXL_ENC_FRAME_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h b/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h index 3458be9ce6f7..0db7012bbe55 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h +++ b/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_GAMMA_CORRECT_H_ #define LIB_JXL_ENC_GAMMA_CORRECT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_group.cc b/third_party/jpeg-xl/lib/jxl/enc_group.cc index 7f2e56235907..91357dc9b70c 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_group.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_group.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_group.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_group.h b/third_party/jpeg-xl/lib/jxl/enc_group.h index aa905a027a0e..62468ddf95e6 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_group.h +++ b/third_party/jpeg-xl/lib/jxl/enc_group.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_GROUP_H_ #define LIB_JXL_ENC_GROUP_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc b/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc index 160b0fb47b7e..ca048dbc0584 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_heuristics.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_heuristics.h b/third_party/jpeg-xl/lib/jxl/enc_heuristics.h index d65fb9b5187b..559603a61978 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_heuristics.h +++ b/third_party/jpeg-xl/lib/jxl/enc_heuristics.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_HEURISTICS_H_ #define LIB_JXL_ENC_HEURISTICS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman.cc b/third_party/jpeg-xl/lib/jxl/enc_huffman.cc index 2910445ee50b..04b5669982e5 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_huffman.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_huffman.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_huffman.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman.h b/third_party/jpeg-xl/lib/jxl/enc_huffman.h index 6ffda5a89687..d7a66584e82f 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_huffman.h +++ b/third_party/jpeg-xl/lib/jxl/enc_huffman.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_HUFFMAN_H_ #define LIB_JXL_ENC_HUFFMAN_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc b/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc index a1ce0184f592..4ec17c6b2259 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_icc_codec.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h b/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h index f449953697dd..2480e3ae9a34 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h +++ b/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_ICC_CODEC_H_ #define LIB_JXL_ENC_ICC_CODEC_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc b/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc index 5455edb902c0..5aac244f5a37 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_image_bundle.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h b/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h index 5cad34443f5e..f5cd00729610 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h +++ b/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_IMAGE_BUNDLE_H_ #define LIB_JXL_ENC_IMAGE_BUNDLE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_modular.cc b/third_party/jpeg-xl/lib/jxl/enc_modular.cc index 0564d50a18d3..43b24822108f 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_modular.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_modular.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_modular.h" @@ -302,6 +293,31 @@ ModularFrameEncoder::ModularFrameEncoder(const FrameHeader& frame_header, : frame_dim(frame_header.ToFrameDimensions()), cparams(cparams_orig) { size_t num_streams = ModularStreamId::Num(frame_dim, frame_header.passes.num_passes); + if (cparams.modular_mode && + cparams.quality_pair == std::pair{100.0, 100.0}) { + switch (cparams.decoding_speed_tier) { + case 0: + break; + case 1: + cparams.options.wp_tree_mode = ModularOptions::TreeMode::kWPOnly; + break; + case 2: { + cparams.options.wp_tree_mode = ModularOptions::TreeMode::kGradientOnly; + cparams.options.predictor = Predictor::Gradient; + break; + } + case 3: { // LZ77, no Gradient. + cparams.options.nb_repeats = 0; + cparams.options.predictor = Predictor::Gradient; + break; + } + default: { // LZ77, no predictor. + cparams.options.nb_repeats = 0; + cparams.options.predictor = Predictor::Zero; + break; + } + } + } stream_images.resize(num_streams); if (cquality > 100) cquality = quality; @@ -1026,7 +1042,11 @@ Status ModularFrameEncoder::EncodeGlobalInfo(BitWriter* writer, params.clustering = HistogramParams::ClusteringType::kFast; params.ans_histogram_strategy = HistogramParams::ANSHistogramStrategy::kApproximate; - params.lz77_method = HistogramParams::LZ77Method::kNone; + params.lz77_method = cparams.decoding_speed_tier >= 3 + ? (cparams.speed_tier == SpeedTier::kFalcon + ? HistogramParams::LZ77Method::kRLE + : HistogramParams::LZ77Method::kLZ77) + : HistogramParams::LZ77Method::kNone; // Near-lossless DC, as well as modular mode, require choosing hybrid uint // more carefully. if ((!extra_dc_precision.empty() && extra_dc_precision[0] != 0) || @@ -1415,7 +1435,7 @@ void ModularFrameEncoder::AddVarDCTDC(const Image3F& dc, size_t group_index, size_t stream_id = ModularStreamId::VarDCTDC(group_index).ID(frame_dim); stream_options[stream_id].max_chan_size = 0xFFFFFF; stream_options[stream_id].predictor = Predictor::Weighted; - stream_options[stream_id].wp_tree_mode = ModularOptions::WPTreeMode::kWPOnly; + stream_options[stream_id].wp_tree_mode = ModularOptions::TreeMode::kWPOnly; if (cparams.speed_tier >= SpeedTier::kSquirrel) { stream_options[stream_id].tree_kind = ModularOptions::TreeKind::kWPFixedDC; } @@ -1550,7 +1570,7 @@ void ModularFrameEncoder::AddACMetadata(size_t group_index, bool jpeg_transcode, const Rect r = enc_state->shared.DCGroupRect(group_index); size_t stream_id = ModularStreamId::ACMetadata(group_index).ID(frame_dim); stream_options[stream_id].max_chan_size = 0xFFFFFF; - stream_options[stream_id].wp_tree_mode = ModularOptions::WPTreeMode::kNoWP; + stream_options[stream_id].wp_tree_mode = ModularOptions::TreeMode::kNoWP; if (jpeg_transcode) { stream_options[stream_id].tree_kind = ModularOptions::TreeKind::kJpegTranscodeACMeta; diff --git a/third_party/jpeg-xl/lib/jxl/enc_modular.h b/third_party/jpeg-xl/lib/jxl/enc_modular.h index 4b8f681b26d1..e7282734a65f 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_modular.h +++ b/third_party/jpeg-xl/lib/jxl/enc_modular.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_MODULAR_H_ #define LIB_JXL_ENC_MODULAR_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_noise.cc b/third_party/jpeg-xl/lib/jxl/enc_noise.cc index a2548c4262d0..383b7922f91e 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_noise.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_noise.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_noise.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_noise.h b/third_party/jpeg-xl/lib/jxl/enc_noise.h index 9471478894f0..15fb07a8c8ed 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_noise.h +++ b/third_party/jpeg-xl/lib/jxl/enc_noise.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_NOISE_H_ #define LIB_JXL_ENC_NOISE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_params.h b/third_party/jpeg-xl/lib/jxl/enc_params.h index 579cfff598d9..872899a5442f 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_params.h +++ b/third_party/jpeg-xl/lib/jxl/enc_params.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_PARAMS_H_ #define LIB_JXL_ENC_PARAMS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc b/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc index e0d321437af2..2a6ed5dbfa7c 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_patch_dictionary.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h b/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h index 13ecb6ebdbd3..f26016f8def1 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h +++ b/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_PATCH_DICTIONARY_H_ #define LIB_JXL_ENC_PATCH_DICTIONARY_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc b/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc index 11d01b42001f..33d0e47bae28 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_quant_weights.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h b/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h index 019a2859b4ea..89033d8cbb8f 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h +++ b/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_QUANT_WEIGHTS_H_ #define LIB_JXL_ENC_QUANT_WEIGHTS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_splines.cc b/third_party/jpeg-xl/lib/jxl/enc_splines.cc index 0c657c5bb8dc..cdb797dc6af7 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_splines.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_splines.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/enc_splines.h b/third_party/jpeg-xl/lib/jxl/enc_splines.h index ea5e3c5568d8..732d77ac2cc4 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_splines.h +++ b/third_party/jpeg-xl/lib/jxl/enc_splines.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_SPLINES_H_ #define LIB_JXL_ENC_SPLINES_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_toc.cc b/third_party/jpeg-xl/lib/jxl/enc_toc.cc index 6729dfa83e93..c877b0c837cc 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_toc.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_toc.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_toc.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_toc.h b/third_party/jpeg-xl/lib/jxl/enc_toc.h index f3133eef41b9..dc81a5d12e39 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_toc.h +++ b/third_party/jpeg-xl/lib/jxl/enc_toc.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_TOC_H_ #define LIB_JXL_ENC_TOC_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h b/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h index 42b3d5b3f431..c2f8e61105b9 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h +++ b/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #if defined(LIB_JXL_ENC_TRANSFORMS_INL_H_) == defined(HWY_TARGET_TOGGLE) #ifdef LIB_JXL_ENC_TRANSFORMS_INL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_transforms.cc b/third_party/jpeg-xl/lib/jxl/enc_transforms.cc index 6b7c302a4e18..8978ba1dcb9b 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_transforms.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_transforms.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_transforms.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_transforms.h b/third_party/jpeg-xl/lib/jxl/enc_transforms.h index 1cf0bec828e4..039ccc389379 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_transforms.h +++ b/third_party/jpeg-xl/lib/jxl/enc_transforms.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_TRANSFORMS_H_ #define LIB_JXL_ENC_TRANSFORMS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/enc_xyb.cc b/third_party/jpeg-xl/lib/jxl/enc_xyb.cc index 0c3e2fe378ab..57383b1b8ebe 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_xyb.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_xyb.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/enc_xyb.h" diff --git a/third_party/jpeg-xl/lib/jxl/enc_xyb.h b/third_party/jpeg-xl/lib/jxl/enc_xyb.h index 711119ea6c44..f30ae2f68b65 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_xyb.h +++ b/third_party/jpeg-xl/lib/jxl/enc_xyb.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENC_XYB_H_ #define LIB_JXL_ENC_XYB_H_ diff --git a/third_party/jpeg-xl/lib/jxl/encode.cc b/third_party/jpeg-xl/lib/jxl/encode.cc index 857ea32c012c..9bd80c60ac88 100644 --- a/third_party/jpeg-xl/lib/jxl/encode.cc +++ b/third_party/jpeg-xl/lib/jxl/encode.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "jxl/encode.h" diff --git a/third_party/jpeg-xl/lib/jxl/encode_internal.h b/third_party/jpeg-xl/lib/jxl/encode_internal.h index ec9543a0cf0f..dc73344cd234 100644 --- a/third_party/jpeg-xl/lib/jxl/encode_internal.h +++ b/third_party/jpeg-xl/lib/jxl/encode_internal.h @@ -1,16 +1,7 @@ -/* Copyright (c) the JPEG XL Project +/* Copyright (c) the JPEG XL Project Authors. All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Use of this source code is governed by a BSD-style + * license that can be found in the LICENSE file. */ #ifndef LIB_JXL_ENCODE_INTERNAL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/encode_test.cc b/third_party/jpeg-xl/lib/jxl/encode_test.cc index fc431521f4b5..328231eb793a 100644 --- a/third_party/jpeg-xl/lib/jxl/encode_test.cc +++ b/third_party/jpeg-xl/lib/jxl/encode_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "jxl/encode.h" diff --git a/third_party/jpeg-xl/lib/jxl/entropy_coder.cc b/third_party/jpeg-xl/lib/jxl/entropy_coder.cc index 89eb526b5c2e..0043c2d31e57 100644 --- a/third_party/jpeg-xl/lib/jxl/entropy_coder.cc +++ b/third_party/jpeg-xl/lib/jxl/entropy_coder.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/entropy_coder.h" diff --git a/third_party/jpeg-xl/lib/jxl/entropy_coder.h b/third_party/jpeg-xl/lib/jxl/entropy_coder.h index d1893464f3ae..e4afa7a63148 100644 --- a/third_party/jpeg-xl/lib/jxl/entropy_coder.h +++ b/third_party/jpeg-xl/lib/jxl/entropy_coder.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ENTROPY_CODER_H_ #define LIB_JXL_ENTROPY_CODER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc b/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc index f0b688f77163..cce1713d2b73 100644 --- a/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc +++ b/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // TODO(deymo): Move these tests to dec_ans.h and common.h diff --git a/third_party/jpeg-xl/lib/jxl/epf.cc b/third_party/jpeg-xl/lib/jxl/epf.cc index dae478b37afe..b83f37ac52d7 100644 --- a/third_party/jpeg-xl/lib/jxl/epf.cc +++ b/third_party/jpeg-xl/lib/jxl/epf.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Edge-preserving smoothing: weighted average based on L1 patch similarity. diff --git a/third_party/jpeg-xl/lib/jxl/epf.h b/third_party/jpeg-xl/lib/jxl/epf.h index 009bf3e8bd44..e72006020970 100644 --- a/third_party/jpeg-xl/lib/jxl/epf.h +++ b/third_party/jpeg-xl/lib/jxl/epf.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_EPF_H_ #define LIB_JXL_EPF_H_ diff --git a/third_party/jpeg-xl/lib/jxl/fast_math-inl.h b/third_party/jpeg-xl/lib/jxl/fast_math-inl.h index edb10766c015..15c0642aafa3 100644 --- a/third_party/jpeg-xl/lib/jxl/fast_math-inl.h +++ b/third_party/jpeg-xl/lib/jxl/fast_math-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Fast SIMD math ops (log2, encoder only, cos, erf for splines) diff --git a/third_party/jpeg-xl/lib/jxl/fast_math_test.cc b/third_party/jpeg-xl/lib/jxl/fast_math_test.cc index 0e0d74da4c0a..50c3bbb03a0f 100644 --- a/third_party/jpeg-xl/lib/jxl/fast_math_test.cc +++ b/third_party/jpeg-xl/lib/jxl/fast_math_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/field_encodings.h b/third_party/jpeg-xl/lib/jxl/field_encodings.h index 0fcb8fa8b9a0..00d0880c7175 100644 --- a/third_party/jpeg-xl/lib/jxl/field_encodings.h +++ b/third_party/jpeg-xl/lib/jxl/field_encodings.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_FIELD_ENCODINGS_H_ #define LIB_JXL_FIELD_ENCODINGS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/fields.cc b/third_party/jpeg-xl/lib/jxl/fields.cc index 361db39eaf5d..7f00c4461017 100644 --- a/third_party/jpeg-xl/lib/jxl/fields.cc +++ b/third_party/jpeg-xl/lib/jxl/fields.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/fields.h" diff --git a/third_party/jpeg-xl/lib/jxl/fields.h b/third_party/jpeg-xl/lib/jxl/fields.h index 80e4671afb61..244b96ff7357 100644 --- a/third_party/jpeg-xl/lib/jxl/fields.h +++ b/third_party/jpeg-xl/lib/jxl/fields.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_FIELDS_H_ #define LIB_JXL_FIELDS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/fields_test.cc b/third_party/jpeg-xl/lib/jxl/fields_test.cc index 88500a25c1bb..78d372dfb39c 100644 --- a/third_party/jpeg-xl/lib/jxl/fields_test.cc +++ b/third_party/jpeg-xl/lib/jxl/fields_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/fields.h" diff --git a/third_party/jpeg-xl/lib/jxl/filters.cc b/third_party/jpeg-xl/lib/jxl/filters.cc index a948d8c7890c..195df1ce966d 100644 --- a/third_party/jpeg-xl/lib/jxl/filters.cc +++ b/third_party/jpeg-xl/lib/jxl/filters.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/filters.h" diff --git a/third_party/jpeg-xl/lib/jxl/filters.h b/third_party/jpeg-xl/lib/jxl/filters.h index 98215484ab3d..2d09c000552c 100644 --- a/third_party/jpeg-xl/lib/jxl/filters.h +++ b/third_party/jpeg-xl/lib/jxl/filters.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_FILTERS_H_ #define LIB_JXL_FILTERS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/filters_internal.h b/third_party/jpeg-xl/lib/jxl/filters_internal.h index ece032c73c48..4ad90faaf223 100644 --- a/third_party/jpeg-xl/lib/jxl/filters_internal.h +++ b/third_party/jpeg-xl/lib/jxl/filters_internal.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_FILTERS_INTERNAL_H_ #define LIB_JXL_FILTERS_INTERNAL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/filters_internal_test.cc b/third_party/jpeg-xl/lib/jxl/filters_internal_test.cc index 0c61c39637fb..c47269d19474 100644 --- a/third_party/jpeg-xl/lib/jxl/filters_internal_test.cc +++ b/third_party/jpeg-xl/lib/jxl/filters_internal_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/filters_internal.h" diff --git a/third_party/jpeg-xl/lib/jxl/frame_header.cc b/third_party/jpeg-xl/lib/jxl/frame_header.cc index 81e20bf81c5c..4a86d6995bc5 100644 --- a/third_party/jpeg-xl/lib/jxl/frame_header.cc +++ b/third_party/jpeg-xl/lib/jxl/frame_header.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/frame_header.h" diff --git a/third_party/jpeg-xl/lib/jxl/frame_header.h b/third_party/jpeg-xl/lib/jxl/frame_header.h index 5c6bcf2c8baf..dab0267adfc0 100644 --- a/third_party/jpeg-xl/lib/jxl/frame_header.h +++ b/third_party/jpeg-xl/lib/jxl/frame_header.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_FRAME_HEADER_H_ #define LIB_JXL_FRAME_HEADER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/gaborish.cc b/third_party/jpeg-xl/lib/jxl/gaborish.cc index 6124681b3268..6a187c46ebb1 100644 --- a/third_party/jpeg-xl/lib/jxl/gaborish.cc +++ b/third_party/jpeg-xl/lib/jxl/gaborish.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/gaborish.h" diff --git a/third_party/jpeg-xl/lib/jxl/gaborish.h b/third_party/jpeg-xl/lib/jxl/gaborish.h index 349bd1b8b10e..e43411dd9ccc 100644 --- a/third_party/jpeg-xl/lib/jxl/gaborish.h +++ b/third_party/jpeg-xl/lib/jxl/gaborish.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_GABORISH_H_ #define LIB_JXL_GABORISH_H_ diff --git a/third_party/jpeg-xl/lib/jxl/gaborish_test.cc b/third_party/jpeg-xl/lib/jxl/gaborish_test.cc index dcb767477828..55b17a060ab8 100644 --- a/third_party/jpeg-xl/lib/jxl/gaborish_test.cc +++ b/third_party/jpeg-xl/lib/jxl/gaborish_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/gaborish.h" diff --git a/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc b/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc index d49eb0879210..d17ce899ba84 100644 --- a/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc +++ b/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/gauss_blur.cc b/third_party/jpeg-xl/lib/jxl/gauss_blur.cc index 51249286a3ec..f9babe701f29 100644 --- a/third_party/jpeg-xl/lib/jxl/gauss_blur.cc +++ b/third_party/jpeg-xl/lib/jxl/gauss_blur.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/gauss_blur.h" diff --git a/third_party/jpeg-xl/lib/jxl/gauss_blur.h b/third_party/jpeg-xl/lib/jxl/gauss_blur.h index d5d111cc6423..fb4741f03a46 100644 --- a/third_party/jpeg-xl/lib/jxl/gauss_blur.h +++ b/third_party/jpeg-xl/lib/jxl/gauss_blur.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_GAUSS_BLUR_H_ #define LIB_JXL_GAUSS_BLUR_H_ diff --git a/third_party/jpeg-xl/lib/jxl/gauss_blur_test.cc b/third_party/jpeg-xl/lib/jxl/gauss_blur_test.cc index 64eda7ecd39c..563548175203 100644 --- a/third_party/jpeg-xl/lib/jxl/gauss_blur_test.cc +++ b/third_party/jpeg-xl/lib/jxl/gauss_blur_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/gauss_blur.h" diff --git a/third_party/jpeg-xl/lib/jxl/gradient_test.cc b/third_party/jpeg-xl/lib/jxl/gradient_test.cc index ed28cdff9d41..332684ae4c04 100644 --- a/third_party/jpeg-xl/lib/jxl/gradient_test.cc +++ b/third_party/jpeg-xl/lib/jxl/gradient_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/headers.cc b/third_party/jpeg-xl/lib/jxl/headers.cc index 217d7e25dce9..41e8595bc448 100644 --- a/third_party/jpeg-xl/lib/jxl/headers.cc +++ b/third_party/jpeg-xl/lib/jxl/headers.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/headers.h" diff --git a/third_party/jpeg-xl/lib/jxl/headers.h b/third_party/jpeg-xl/lib/jxl/headers.h index 13a44f82be90..d33e2b5498ea 100644 --- a/third_party/jpeg-xl/lib/jxl/headers.h +++ b/third_party/jpeg-xl/lib/jxl/headers.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_HEADERS_H_ #define LIB_JXL_HEADERS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/huffman_table.cc b/third_party/jpeg-xl/lib/jxl/huffman_table.cc index 7286e2b90b68..9ae7865af62c 100644 --- a/third_party/jpeg-xl/lib/jxl/huffman_table.cc +++ b/third_party/jpeg-xl/lib/jxl/huffman_table.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/huffman_table.h" diff --git a/third_party/jpeg-xl/lib/jxl/huffman_table.h b/third_party/jpeg-xl/lib/jxl/huffman_table.h index ff404e8ea296..11cdb2fc4596 100644 --- a/third_party/jpeg-xl/lib/jxl/huffman_table.h +++ b/third_party/jpeg-xl/lib/jxl/huffman_table.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_HUFFMAN_TABLE_H_ #define LIB_JXL_HUFFMAN_TABLE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/huffman_tree.cc b/third_party/jpeg-xl/lib/jxl/huffman_tree.cc index ab88c19d3952..77107b08d268 100644 --- a/third_party/jpeg-xl/lib/jxl/huffman_tree.cc +++ b/third_party/jpeg-xl/lib/jxl/huffman_tree.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/huffman_tree.h" diff --git a/third_party/jpeg-xl/lib/jxl/huffman_tree.h b/third_party/jpeg-xl/lib/jxl/huffman_tree.h index 4550f7750b6f..e4ccac49bcfe 100644 --- a/third_party/jpeg-xl/lib/jxl/huffman_tree.h +++ b/third_party/jpeg-xl/lib/jxl/huffman_tree.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Library for creating Huffman codes from population counts. diff --git a/third_party/jpeg-xl/lib/jxl/iaca_test.cc b/third_party/jpeg-xl/lib/jxl/iaca_test.cc index 1a155a10b758..9b2e8ea25c5a 100644 --- a/third_party/jpeg-xl/lib/jxl/iaca_test.cc +++ b/third_party/jpeg-xl/lib/jxl/iaca_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/iaca.h" diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec.cc b/third_party/jpeg-xl/lib/jxl/icc_codec.cc index c8215ea786e7..619c81451ecd 100644 --- a/third_party/jpeg-xl/lib/jxl/icc_codec.cc +++ b/third_party/jpeg-xl/lib/jxl/icc_codec.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/icc_codec.h" diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec.h b/third_party/jpeg-xl/lib/jxl/icc_codec.h index ddbe2295c060..d55b316957cc 100644 --- a/third_party/jpeg-xl/lib/jxl/icc_codec.h +++ b/third_party/jpeg-xl/lib/jxl/icc_codec.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ICC_CODEC_H_ #define LIB_JXL_ICC_CODEC_H_ diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc b/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc index a1709de034a4..1e118c5d5c99 100644 --- a/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc +++ b/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/icc_codec_common.h" diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec_common.h b/third_party/jpeg-xl/lib/jxl/icc_codec_common.h index b50246a353ec..8ccc7e909163 100644 --- a/third_party/jpeg-xl/lib/jxl/icc_codec_common.h +++ b/third_party/jpeg-xl/lib/jxl/icc_codec_common.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_ICC_CODEC_COMMON_H_ #define LIB_JXL_ICC_CODEC_COMMON_H_ diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc b/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc index 36adf49e334a..d365471afabb 100644 --- a/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc +++ b/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/icc_codec.h" diff --git a/third_party/jpeg-xl/lib/jxl/image.cc b/third_party/jpeg-xl/lib/jxl/image.cc index b0c91d23724c..1573a5b93a76 100644 --- a/third_party/jpeg-xl/lib/jxl/image.cc +++ b/third_party/jpeg-xl/lib/jxl/image.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/image.h" diff --git a/third_party/jpeg-xl/lib/jxl/image.h b/third_party/jpeg-xl/lib/jxl/image.h index 4e643d86cccd..f000f6881c86 100644 --- a/third_party/jpeg-xl/lib/jxl/image.h +++ b/third_party/jpeg-xl/lib/jxl/image.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_IMAGE_H_ #define LIB_JXL_IMAGE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/image_bundle.cc b/third_party/jpeg-xl/lib/jxl/image_bundle.cc index aa5c6bdcf4c2..104a6e25a3f5 100644 --- a/third_party/jpeg-xl/lib/jxl/image_bundle.cc +++ b/third_party/jpeg-xl/lib/jxl/image_bundle.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/image_bundle.h" diff --git a/third_party/jpeg-xl/lib/jxl/image_bundle.h b/third_party/jpeg-xl/lib/jxl/image_bundle.h index 66d8a8d4147b..cd39c7a0ef57 100644 --- a/third_party/jpeg-xl/lib/jxl/image_bundle.h +++ b/third_party/jpeg-xl/lib/jxl/image_bundle.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_IMAGE_BUNDLE_H_ #define LIB_JXL_IMAGE_BUNDLE_H_ @@ -224,6 +215,7 @@ class ImageBundle { uint32_t duration = 0; bool use_for_next_frame = false; bool blend = false; + BlendMode blendmode = BlendMode::kBlend; std::string name; private: diff --git a/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc b/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc index 52bab8b511f7..6de2e49dbf40 100644 --- a/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc +++ b/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/image_bundle.h" diff --git a/third_party/jpeg-xl/lib/jxl/image_metadata.cc b/third_party/jpeg-xl/lib/jxl/image_metadata.cc index a828407bff13..bc462402e520 100644 --- a/third_party/jpeg-xl/lib/jxl/image_metadata.cc +++ b/third_party/jpeg-xl/lib/jxl/image_metadata.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/image_metadata.h" diff --git a/third_party/jpeg-xl/lib/jxl/image_metadata.h b/third_party/jpeg-xl/lib/jxl/image_metadata.h index 7e8409a3f52e..4b644e20b9c6 100644 --- a/third_party/jpeg-xl/lib/jxl/image_metadata.h +++ b/third_party/jpeg-xl/lib/jxl/image_metadata.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Main codestream header bundles, the metadata that applies to all frames. diff --git a/third_party/jpeg-xl/lib/jxl/image_ops.h b/third_party/jpeg-xl/lib/jxl/image_ops.h index e5d6517ecbd4..f3c2b5995eec 100644 --- a/third_party/jpeg-xl/lib/jxl/image_ops.h +++ b/third_party/jpeg-xl/lib/jxl/image_ops.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_IMAGE_OPS_H_ #define LIB_JXL_IMAGE_OPS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/image_ops_test.cc b/third_party/jpeg-xl/lib/jxl/image_ops_test.cc index 841dff7d3a43..84801feb5af0 100644 --- a/third_party/jpeg-xl/lib/jxl/image_ops_test.cc +++ b/third_party/jpeg-xl/lib/jxl/image_ops_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/image_ops.h" diff --git a/third_party/jpeg-xl/lib/jxl/image_test_utils.h b/third_party/jpeg-xl/lib/jxl/image_test_utils.h index 80ab32264429..ac50883a855f 100644 --- a/third_party/jpeg-xl/lib/jxl/image_test_utils.h +++ b/third_party/jpeg-xl/lib/jxl/image_test_utils.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_IMAGE_TEST_UTILS_H_ #define LIB_JXL_IMAGE_TEST_UTILS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc index d7fdf7eff45a..f57f697139c2 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc +++ b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/jpeg/dec_jpeg_data.h" diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h index 18e6c66e761e..b9d50bf9f840 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_JPEG_DEC_JPEG_DATA_H_ #define LIB_JXL_JPEG_DEC_JPEG_DATA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc index e99f3ea4f523..c321344ebfdf 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc +++ b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/jpeg/dec_jpeg_data_writer.h" diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h index 81634ffe9e68..28f5141f4122 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Functions for writing a JPEGData object into a jpeg byte stream. diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h index c165b46a6a11..e003c049528e 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_JPEG_DEC_JPEG_OUTPUT_CHUNK_H_ #define LIB_JXL_JPEG_DEC_JPEG_OUTPUT_CHUNK_H_ diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h index 891dc8500101..a25c335b5900 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_JPEG_DEC_JPEG_SERIALIZATION_STATE_H_ #define LIB_JXL_JPEG_DEC_JPEG_SERIALIZATION_STATE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc index dba7db9ab8f2..d566e8e7f0eb 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc +++ b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/jpeg/enc_jpeg_data.h" diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h index 2f1c78c8a52a..5d6e89ebd3ec 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_JPEG_ENC_JPEG_DATA_H_ #define LIB_JXL_JPEG_ENC_JPEG_DATA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc index a88a729075af..6e24557a2762 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc +++ b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/jpeg/enc_jpeg_data_reader.h" diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h index 0c45f770a2ea..3fad820e9d1f 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Functions for reading a jpeg byte stream into a JPEGData object. diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc index e8bbf4dbe546..38282e640a6d 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc +++ b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/jpeg/enc_jpeg_huffman_decode.h" diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h index 034c6a99324c..b8a60e4107fb 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Utility function for building a Huffman lookup table for the jpeg decoder. diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc b/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc index c623f4d5cdc4..9cff6e486a59 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc +++ b/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/jpeg/jpeg_data.h" diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h b/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h index b47c1e948e7d..8b0089c25372 100644 --- a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h +++ b/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Data structures that represent the non-pixel contents of a jpeg file. diff --git a/third_party/jpeg-xl/lib/jxl/jxl_inspection.h b/third_party/jpeg-xl/lib/jxl/jxl_inspection.h index d3c481a12fee..0b70a5852303 100644 --- a/third_party/jpeg-xl/lib/jxl/jxl_inspection.h +++ b/third_party/jpeg-xl/lib/jxl/jxl_inspection.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_JXL_INSPECTION_H_ #define LIB_JXL_JXL_INSPECTION_H_ diff --git a/third_party/jpeg-xl/lib/jxl/jxl_test.cc b/third_party/jpeg-xl/lib/jxl/jxl_test.cc index 9a47756b9331..c7203296abe4 100644 --- a/third_party/jpeg-xl/lib/jxl/jxl_test.cc +++ b/third_party/jpeg-xl/lib/jxl/jxl_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include @@ -1458,5 +1449,26 @@ TEST(JxlTest, RoundtripProgressive) { 4.0f); } +TEST(JxlTest, RoundtripAnimationPatches) { + ThreadPool* pool = nullptr; + const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif"); + CodecInOut io; + ASSERT_TRUE(SetFromBytes(Span(orig), &io, pool)); + ASSERT_EQ(2, io.frames.size()); + + CompressParams cparams; + cparams.patches = Override::kOn; + DecompressParams dparams; + CodecInOut io2; + // 40k with no patches, 27k with patch frames encoded multiple times. + EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000); + + EXPECT_EQ(io2.frames.size(), io.frames.size()); + // >10 with broken patches + EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params, + /*distmap=*/nullptr, pool), + 2.0); +} + } // namespace } // namespace jxl diff --git a/third_party/jpeg-xl/lib/jxl/lehmer_code.h b/third_party/jpeg-xl/lib/jxl/lehmer_code.h index 98d83d8a455b..dd1d21c6f7dc 100644 --- a/third_party/jpeg-xl/lib/jxl/lehmer_code.h +++ b/third_party/jpeg-xl/lib/jxl/lehmer_code.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_LEHMER_CODE_H_ #define LIB_JXL_LEHMER_CODE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc b/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc index b0dea2d46762..1ce5618ea1f6 100644 --- a/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc +++ b/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/lehmer_code.h" diff --git a/third_party/jpeg-xl/lib/jxl/linalg.cc b/third_party/jpeg-xl/lib/jxl/linalg.cc index 6ff1a3838c17..61d66dd8db9f 100644 --- a/third_party/jpeg-xl/lib/jxl/linalg.cc +++ b/third_party/jpeg-xl/lib/jxl/linalg.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/linalg.h" diff --git a/third_party/jpeg-xl/lib/jxl/linalg.h b/third_party/jpeg-xl/lib/jxl/linalg.h index 9d7955a13540..7fbd943d9005 100644 --- a/third_party/jpeg-xl/lib/jxl/linalg.h +++ b/third_party/jpeg-xl/lib/jxl/linalg.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_LINALG_H_ #define LIB_JXL_LINALG_H_ diff --git a/third_party/jpeg-xl/lib/jxl/linalg_test.cc b/third_party/jpeg-xl/lib/jxl/linalg_test.cc index 0df1cf10f92c..0842f61dad0b 100644 --- a/third_party/jpeg-xl/lib/jxl/linalg_test.cc +++ b/third_party/jpeg-xl/lib/jxl/linalg_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/linalg.h" diff --git a/third_party/jpeg-xl/lib/jxl/loop_filter.cc b/third_party/jpeg-xl/lib/jxl/loop_filter.cc index 088676d30d26..afa36a44e63d 100644 --- a/third_party/jpeg-xl/lib/jxl/loop_filter.cc +++ b/third_party/jpeg-xl/lib/jxl/loop_filter.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/loop_filter.h" diff --git a/third_party/jpeg-xl/lib/jxl/loop_filter.h b/third_party/jpeg-xl/lib/jxl/loop_filter.h index 6ecec1bb2d7d..ffa68b512032 100644 --- a/third_party/jpeg-xl/lib/jxl/loop_filter.h +++ b/third_party/jpeg-xl/lib/jxl/loop_filter.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_LOOP_FILTER_H_ #define LIB_JXL_LOOP_FILTER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/luminance.cc b/third_party/jpeg-xl/lib/jxl/luminance.cc index adbef91a51b2..9eba4d4011c4 100644 --- a/third_party/jpeg-xl/lib/jxl/luminance.cc +++ b/third_party/jpeg-xl/lib/jxl/luminance.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/luminance.h" diff --git a/third_party/jpeg-xl/lib/jxl/luminance.h b/third_party/jpeg-xl/lib/jxl/luminance.h index 44a248bc11c7..c6a9d9e18427 100644 --- a/third_party/jpeg-xl/lib/jxl/luminance.h +++ b/third_party/jpeg-xl/lib/jxl/luminance.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_LUMINANCE_H_ #define LIB_JXL_LUMINANCE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc b/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc index c4411d6d509a..87727e75cd35 100644 --- a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc +++ b/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/memory_manager_internal.h" diff --git a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h b/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h index 21dd8df02abb..b4a78903fe0a 100644 --- a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h +++ b/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MEMORY_MANAGER_INTERNAL_H_ #define LIB_JXL_MEMORY_MANAGER_INTERNAL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h index b1a96ea20ef8..5660bd386516 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_ #define LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc index 356cff35d8a7..5be9d756edbd 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/modular/encoding/dec_ma.h" diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h index 2207c34ef90e..a910c4deb1f4 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_ENCODING_DEC_MA_H_ #define LIB_JXL_MODULAR_ENCODING_DEC_MA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc index 6dd2a24ba173..6c0fceebf01f 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h index c409c0a1958c..9c083e957585 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_ENCODING_ENC_ENCODING_H_ #define LIB_JXL_MODULAR_ENCODING_ENC_ENCODING_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc index a9872a88b557..7f575a142438 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/modular/encoding/enc_ma.h" @@ -542,13 +533,13 @@ constexpr int TreeSamples::kPropertyRange; constexpr uint32_t TreeSamples::kDedupEntryUnused; Status TreeSamples::SetPredictor(Predictor predictor, - ModularOptions::WPTreeMode wp_tree_mode) { - if (wp_tree_mode == ModularOptions::WPTreeMode::kWPOnly) { + ModularOptions::TreeMode wp_tree_mode) { + if (wp_tree_mode == ModularOptions::TreeMode::kWPOnly) { predictors = {Predictor::Weighted}; residuals.resize(1); return true; } - if (wp_tree_mode == ModularOptions::WPTreeMode::kNoWP && + if (wp_tree_mode == ModularOptions::TreeMode::kNoWP && predictor == Predictor::Weighted) { return JXL_FAILURE("Invalid predictor settings"); } @@ -563,7 +554,7 @@ Status TreeSamples::SetPredictor(Predictor predictor, } else { predictors = {predictor}; } - if (wp_tree_mode == ModularOptions::WPTreeMode::kNoWP) { + if (wp_tree_mode == ModularOptions::TreeMode::kNoWP) { auto wp_it = std::find(predictors.begin(), predictors.end(), Predictor::Weighted); if (wp_it != predictors.end()) { @@ -575,12 +566,15 @@ Status TreeSamples::SetPredictor(Predictor predictor, } Status TreeSamples::SetProperties(const std::vector &properties, - ModularOptions::WPTreeMode wp_tree_mode) { + ModularOptions::TreeMode wp_tree_mode) { props_to_use = properties; - if (wp_tree_mode == ModularOptions::WPTreeMode::kWPOnly) { + if (wp_tree_mode == ModularOptions::TreeMode::kWPOnly) { props_to_use = {kWPProp}; } - if (wp_tree_mode == ModularOptions::WPTreeMode::kNoWP) { + if (wp_tree_mode == ModularOptions::TreeMode::kGradientOnly) { + props_to_use = {kGradientProp}; + } + if (wp_tree_mode == ModularOptions::TreeMode::kNoWP) { auto it = std::find(props_to_use.begin(), props_to_use.end(), kWPProp); if (it != props_to_use.end()) { props_to_use.erase(it); diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h index f0bd5d0fb7a9..d0a90cc952ff 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_ENCODING_ENC_MA_H_ #define LIB_JXL_MODULAR_ENCODING_ENC_MA_H_ @@ -34,10 +25,10 @@ struct TreeSamples { size_t NumSamples() const { return num_samples; } // Set the predictor to use. Must be called before adding any samples. Status SetPredictor(Predictor predictor, - ModularOptions::WPTreeMode wp_tree_mode); + ModularOptions::TreeMode wp_tree_mode); // Set the properties to use. Must be called before adding any samples. Status SetProperties(const std::vector &properties, - ModularOptions::WPTreeMode wp_tree_mode); + ModularOptions::TreeMode wp_tree_mode); size_t Token(size_t pred, size_t i) const { return residuals[pred][i].tok; } size_t NBits(size_t pred, size_t i) const { return residuals[pred][i].nbits; } diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc index d8f92b0fc4e0..2fed0e42c749 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/modular/encoding/encoding.h" diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h index 727efc15cef7..b7ef993b3669 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_ENCODING_ENCODING_H_ #define LIB_JXL_MODULAR_ENCODING_ENCODING_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h index c4e6342cff86..e5b6cf3335a0 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_ENCODING_MA_COMMON_H_ #define LIB_JXL_MODULAR_ENCODING_MA_COMMON_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc b/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc index 9b880f62e83e..e30d82c31f80 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/modular/modular_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/modular/modular_image.h b/third_party/jpeg-xl/lib/jxl/modular/modular_image.h index 13b280792935..20e9c80edac8 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/modular_image.h +++ b/third_party/jpeg-xl/lib/jxl/modular/modular_image.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_MODULAR_IMAGE_H_ #define LIB_JXL_MODULAR_MODULAR_IMAGE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/options.h b/third_party/jpeg-xl/lib/jxl/modular/options.h index f9be61e80c11..8e2381055baf 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/options.h +++ b/third_party/jpeg-xl/lib/jxl/modular/options.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_OPTIONS_H_ #define LIB_JXL_MODULAR_OPTIONS_H_ @@ -149,9 +140,9 @@ struct ModularOptions { float fast_decode_multiplier = 1.01f; // Forces the encoder to produce a tree that is compatible with the WP-only - // decode path (or with the no-wp path). - enum class WPTreeMode { kWPOnly, kNoWP, kDefault }; - WPTreeMode wp_tree_mode = WPTreeMode::kDefault; + // decode path (or with the no-wp path, or the gradient-only path). + enum class TreeMode { kGradientOnly, kWPOnly, kNoWP, kDefault }; + TreeMode wp_tree_mode = TreeMode::kDefault; // Skip fast paths in the encoder. bool skip_encoder_fast_path = false; diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/near-lossless.h b/third_party/jpeg-xl/lib/jxl/modular/transform/near-lossless.h index 632ca07890fc..0b0781ab7880 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/near-lossless.h +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/near-lossless.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_TRANSFORM_NEAR_LOSSLESS_H_ #define LIB_JXL_MODULAR_TRANSFORM_NEAR_LOSSLESS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h b/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h index 6b69f39faac2..14109eaae64a 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_TRANSFORM_PALETTE_H_ #define LIB_JXL_MODULAR_TRANSFORM_PALETTE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h b/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h index 81d5b5ab8141..edf13e78f7c6 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_TRANSFORM_SQUEEZE_H_ #define LIB_JXL_MODULAR_TRANSFORM_SQUEEZE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/subtractgreen.h b/third_party/jpeg-xl/lib/jxl/modular/transform/subtractgreen.h index d65d5d6a2caf..adf4187eca11 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/subtractgreen.h +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/subtractgreen.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_TRANSFORM_SUBTRACTGREEN_H_ #define LIB_JXL_MODULAR_TRANSFORM_SUBTRACTGREEN_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc index f0e7555cd9ea..b6a1fb83cbe6 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/modular/transform/transform.h" diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h index 18ed038bfc8d..824031b2ccc7 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h +++ b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_MODULAR_TRANSFORM_TRANSFORM_H_ #define LIB_JXL_MODULAR_TRANSFORM_TRANSFORM_H_ diff --git a/third_party/jpeg-xl/lib/jxl/modular_test.cc b/third_party/jpeg-xl/lib/jxl/modular_test.cc index aed47e7a0bbc..11bb5e5ce074 100644 --- a/third_party/jpeg-xl/lib/jxl/modular_test.cc +++ b/third_party/jpeg-xl/lib/jxl/modular_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl/noise.h b/third_party/jpeg-xl/lib/jxl/noise.h index 7066eb13915c..209ad6c7489d 100644 --- a/third_party/jpeg-xl/lib/jxl/noise.h +++ b/third_party/jpeg-xl/lib/jxl/noise.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_NOISE_H_ #define LIB_JXL_NOISE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/noise_distributions.h b/third_party/jpeg-xl/lib/jxl/noise_distributions.h index f7f1d9fef4e7..65a61cc6efd9 100644 --- a/third_party/jpeg-xl/lib/jxl/noise_distributions.h +++ b/third_party/jpeg-xl/lib/jxl/noise_distributions.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_NOISE_DISTRIBUTIONS_H_ #define LIB_JXL_NOISE_DISTRIBUTIONS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc b/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc index 0d7e09931fc8..d79c7cf47943 100644 --- a/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc +++ b/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc b/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc index 3afd5686aa28..b7c196425967 100644 --- a/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc +++ b/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "gtest/gtest.h" #include "lib/jxl/base/data_parallel.h" diff --git a/third_party/jpeg-xl/lib/jxl/opsin_params.cc b/third_party/jpeg-xl/lib/jxl/opsin_params.cc index 2fe2a41c9126..f80a18af8c3e 100644 --- a/third_party/jpeg-xl/lib/jxl/opsin_params.cc +++ b/third_party/jpeg-xl/lib/jxl/opsin_params.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/opsin_params.h" diff --git a/third_party/jpeg-xl/lib/jxl/opsin_params.h b/third_party/jpeg-xl/lib/jxl/opsin_params.h index 80b44af09d58..e8e2e4331ef9 100644 --- a/third_party/jpeg-xl/lib/jxl/opsin_params.h +++ b/third_party/jpeg-xl/lib/jxl/opsin_params.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_OPSIN_PARAMS_H_ #define LIB_JXL_OPSIN_PARAMS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/optimize.cc b/third_party/jpeg-xl/lib/jxl/optimize.cc index 71cee1ed2990..0816596365d9 100644 --- a/third_party/jpeg-xl/lib/jxl/optimize.cc +++ b/third_party/jpeg-xl/lib/jxl/optimize.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/optimize.h" diff --git a/third_party/jpeg-xl/lib/jxl/optimize.h b/third_party/jpeg-xl/lib/jxl/optimize.h index dbd891997ede..0a60198214cb 100644 --- a/third_party/jpeg-xl/lib/jxl/optimize.h +++ b/third_party/jpeg-xl/lib/jxl/optimize.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Utility functions for optimizing multi-dimensional nonlinear functions. diff --git a/third_party/jpeg-xl/lib/jxl/optimize_test.cc b/third_party/jpeg-xl/lib/jxl/optimize_test.cc index 9ea695119bed..5d5b5a83655e 100644 --- a/third_party/jpeg-xl/lib/jxl/optimize_test.cc +++ b/third_party/jpeg-xl/lib/jxl/optimize_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/optimize.h" diff --git a/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc b/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc index 4c01b9af2aca..1f4786fbcf44 100644 --- a/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc +++ b/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/padded_bytes.h" diff --git a/third_party/jpeg-xl/lib/jxl/passes_state.cc b/third_party/jpeg-xl/lib/jxl/passes_state.cc index ce998e0411ec..a0cc1983fe04 100644 --- a/third_party/jpeg-xl/lib/jxl/passes_state.cc +++ b/third_party/jpeg-xl/lib/jxl/passes_state.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/passes_state.h" diff --git a/third_party/jpeg-xl/lib/jxl/passes_state.h b/third_party/jpeg-xl/lib/jxl/passes_state.h index ee769e012561..069d7acdf0e9 100644 --- a/third_party/jpeg-xl/lib/jxl/passes_state.h +++ b/third_party/jpeg-xl/lib/jxl/passes_state.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_PASSES_STATE_H_ #define LIB_JXL_PASSES_STATE_H_ diff --git a/third_party/jpeg-xl/lib/jxl/passes_test.cc b/third_party/jpeg-xl/lib/jxl/passes_test.cc index 44da23c8e7ad..8a02fa7a7e26 100644 --- a/third_party/jpeg-xl/lib/jxl/passes_test.cc +++ b/third_party/jpeg-xl/lib/jxl/passes_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h b/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h index 921412cd7572..e4172f6db671 100644 --- a/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h +++ b/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_PATCH_DICTIONARY_INTERNAL_H_ #define LIB_JXL_PATCH_DICTIONARY_INTERNAL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc b/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc index e3d5326d4b43..3bcc1351e66d 100644 --- a/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc +++ b/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "gtest/gtest.h" #include "lib/extras/codec.h" diff --git a/third_party/jpeg-xl/lib/jxl/preview_test.cc b/third_party/jpeg-xl/lib/jxl/preview_test.cc index b396ce227578..0a36be8c7b11 100644 --- a/third_party/jpeg-xl/lib/jxl/preview_test.cc +++ b/third_party/jpeg-xl/lib/jxl/preview_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/progressive_split.cc b/third_party/jpeg-xl/lib/jxl/progressive_split.cc index e580c5de4896..d0a16b915adc 100644 --- a/third_party/jpeg-xl/lib/jxl/progressive_split.cc +++ b/third_party/jpeg-xl/lib/jxl/progressive_split.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/progressive_split.h" diff --git a/third_party/jpeg-xl/lib/jxl/progressive_split.h b/third_party/jpeg-xl/lib/jxl/progressive_split.h index 4a3513f3c0dc..2898b9092d13 100644 --- a/third_party/jpeg-xl/lib/jxl/progressive_split.h +++ b/third_party/jpeg-xl/lib/jxl/progressive_split.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_PROGRESSIVE_SPLIT_H_ #define LIB_JXL_PROGRESSIVE_SPLIT_H_ diff --git a/third_party/jpeg-xl/lib/jxl/quant_weights.cc b/third_party/jpeg-xl/lib/jxl/quant_weights.cc index aefd1c0aa66c..ff48897e0fc3 100644 --- a/third_party/jpeg-xl/lib/jxl/quant_weights.cc +++ b/third_party/jpeg-xl/lib/jxl/quant_weights.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/quant_weights.h" #include diff --git a/third_party/jpeg-xl/lib/jxl/quant_weights.h b/third_party/jpeg-xl/lib/jxl/quant_weights.h index 1f621b0ce867..816362f81c83 100644 --- a/third_party/jpeg-xl/lib/jxl/quant_weights.h +++ b/third_party/jpeg-xl/lib/jxl/quant_weights.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_QUANT_WEIGHTS_H_ #define LIB_JXL_QUANT_WEIGHTS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc b/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc index 4ab149770b07..2392c74cc6a2 100644 --- a/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc +++ b/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/quant_weights.h" #include diff --git a/third_party/jpeg-xl/lib/jxl/quantizer-inl.h b/third_party/jpeg-xl/lib/jxl/quantizer-inl.h index 47b8e7218f4c..2627148dc27e 100644 --- a/third_party/jpeg-xl/lib/jxl/quantizer-inl.h +++ b/third_party/jpeg-xl/lib/jxl/quantizer-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #if defined(LIB_JXL_QUANTIZER_INL_H_) == defined(HWY_TARGET_TOGGLE) #ifdef LIB_JXL_QUANTIZER_INL_H_ diff --git a/third_party/jpeg-xl/lib/jxl/quantizer.cc b/third_party/jpeg-xl/lib/jxl/quantizer.cc index d832562ed67e..2a7480f17507 100644 --- a/third_party/jpeg-xl/lib/jxl/quantizer.cc +++ b/third_party/jpeg-xl/lib/jxl/quantizer.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/quantizer.h" diff --git a/third_party/jpeg-xl/lib/jxl/quantizer.h b/third_party/jpeg-xl/lib/jxl/quantizer.h index c01b56ccffdb..f2da45f1c4ce 100644 --- a/third_party/jpeg-xl/lib/jxl/quantizer.h +++ b/third_party/jpeg-xl/lib/jxl/quantizer.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_QUANTIZER_H_ #define LIB_JXL_QUANTIZER_H_ diff --git a/third_party/jpeg-xl/lib/jxl/quantizer_test.cc b/third_party/jpeg-xl/lib/jxl/quantizer_test.cc index 34bd48d21a27..052e138fe3fd 100644 --- a/third_party/jpeg-xl/lib/jxl/quantizer_test.cc +++ b/third_party/jpeg-xl/lib/jxl/quantizer_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/quantizer.h" diff --git a/third_party/jpeg-xl/lib/jxl/rational_polynomial-inl.h b/third_party/jpeg-xl/lib/jxl/rational_polynomial-inl.h index c2842acd788c..87bddd1bb209 100644 --- a/third_party/jpeg-xl/lib/jxl/rational_polynomial-inl.h +++ b/third_party/jpeg-xl/lib/jxl/rational_polynomial-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Fast SIMD evaluation of rational polynomials for approximating functions. diff --git a/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc b/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc index a2eb6b009089..699afd076e55 100644 --- a/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc +++ b/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/robust_statistics_test.cc b/third_party/jpeg-xl/lib/jxl/robust_statistics_test.cc index 6ddb32a1e605..22ee56abdbee 100644 --- a/third_party/jpeg-xl/lib/jxl/robust_statistics_test.cc +++ b/third_party/jpeg-xl/lib/jxl/robust_statistics_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/robust_statistics.h" diff --git a/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc b/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc index c519521b7a8c..13e6ad675469 100644 --- a/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc +++ b/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "gtest/gtest.h" #include "jxl/decode.h" diff --git a/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc b/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc index ac0ac1e49d86..71c18e301653 100644 --- a/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc +++ b/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include diff --git a/third_party/jpeg-xl/lib/jxl/splines.cc b/third_party/jpeg-xl/lib/jxl/splines.cc index d4df452389bf..802fc5b02949 100644 --- a/third_party/jpeg-xl/lib/jxl/splines.cc +++ b/third_party/jpeg-xl/lib/jxl/splines.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/splines.h" diff --git a/third_party/jpeg-xl/lib/jxl/splines.h b/third_party/jpeg-xl/lib/jxl/splines.h index 0a7bb7135e1c..8ec10e928d56 100644 --- a/third_party/jpeg-xl/lib/jxl/splines.h +++ b/third_party/jpeg-xl/lib/jxl/splines.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_SPLINES_H_ #define LIB_JXL_SPLINES_H_ diff --git a/third_party/jpeg-xl/lib/jxl/splines_gbench.cc b/third_party/jpeg-xl/lib/jxl/splines_gbench.cc index c0674aca8748..490bdb00e1ba 100644 --- a/third_party/jpeg-xl/lib/jxl/splines_gbench.cc +++ b/third_party/jpeg-xl/lib/jxl/splines_gbench.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "benchmark/benchmark.h" #include "lib/jxl/splines.h" diff --git a/third_party/jpeg-xl/lib/jxl/splines_test.cc b/third_party/jpeg-xl/lib/jxl/splines_test.cc index b2d9270c6094..8e6dfc5dd4d8 100644 --- a/third_party/jpeg-xl/lib/jxl/splines_test.cc +++ b/third_party/jpeg-xl/lib/jxl/splines_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/splines.h" diff --git a/third_party/jpeg-xl/lib/jxl/test_utils.h b/third_party/jpeg-xl/lib/jxl/test_utils.h index f1c4de078df2..e325d1e4b1e7 100644 --- a/third_party/jpeg-xl/lib/jxl/test_utils.h +++ b/third_party/jpeg-xl/lib/jxl/test_utils.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_TEST_UTILS_H_ #define LIB_JXL_TEST_UTILS_H_ diff --git a/third_party/jpeg-xl/lib/jxl/testdata.h b/third_party/jpeg-xl/lib/jxl/testdata.h index cf49e81d0eaf..28d1015d0b40 100644 --- a/third_party/jpeg-xl/lib/jxl/testdata.h +++ b/third_party/jpeg-xl/lib/jxl/testdata.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_TESTDATA_H_ #define LIB_JXL_TESTDATA_H_ diff --git a/third_party/jpeg-xl/lib/jxl/tf_gbench.cc b/third_party/jpeg-xl/lib/jxl/tf_gbench.cc index e56fdb62408b..9c010d460a5b 100644 --- a/third_party/jpeg-xl/lib/jxl/tf_gbench.cc +++ b/third_party/jpeg-xl/lib/jxl/tf_gbench.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "benchmark/benchmark.h" #include "lib/jxl/image_ops.h" diff --git a/third_party/jpeg-xl/lib/jxl/toc.cc b/third_party/jpeg-xl/lib/jxl/toc.cc index 35c2b7a6b1c5..3a2193e42df2 100644 --- a/third_party/jpeg-xl/lib/jxl/toc.cc +++ b/third_party/jpeg-xl/lib/jxl/toc.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/toc.h" diff --git a/third_party/jpeg-xl/lib/jxl/toc.h b/third_party/jpeg-xl/lib/jxl/toc.h index 6955e19837a9..ffebdf9115ee 100644 --- a/third_party/jpeg-xl/lib/jxl/toc.h +++ b/third_party/jpeg-xl/lib/jxl/toc.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_JXL_TOC_H_ #define LIB_JXL_TOC_H_ diff --git a/third_party/jpeg-xl/lib/jxl/toc_test.cc b/third_party/jpeg-xl/lib/jxl/toc_test.cc index e235214ed895..ef27320926b6 100644 --- a/third_party/jpeg-xl/lib/jxl/toc_test.cc +++ b/third_party/jpeg-xl/lib/jxl/toc_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/toc.h" diff --git a/third_party/jpeg-xl/lib/jxl/transfer_functions-inl.h b/third_party/jpeg-xl/lib/jxl/transfer_functions-inl.h index 6d8b28fae8d5..43069ac0be1a 100644 --- a/third_party/jpeg-xl/lib/jxl/transfer_functions-inl.h +++ b/third_party/jpeg-xl/lib/jxl/transfer_functions-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Transfer functions for color encodings. diff --git a/third_party/jpeg-xl/lib/jxl/transpose-inl.h b/third_party/jpeg-xl/lib/jxl/transpose-inl.h index 72119c628ffa..d12b1295e8ed 100644 --- a/third_party/jpeg-xl/lib/jxl/transpose-inl.h +++ b/third_party/jpeg-xl/lib/jxl/transpose-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Block transpose for DCT/IDCT diff --git a/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h b/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h index 0536a685357a..6c1865181c45 100644 --- a/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h +++ b/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // Fast but weak random generator. diff --git a/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc b/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc index c66bbf96c39a..f86f92190645 100644 --- a/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc +++ b/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/lib/jxl_benchmark.cmake b/third_party/jpeg-xl/lib/jxl_benchmark.cmake index 0f33c55c6d95..a5933c539749 100644 --- a/third_party/jpeg-xl/lib/jxl_benchmark.cmake +++ b/third_party/jpeg-xl/lib/jxl_benchmark.cmake @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # All files ending in "_gbench.cc" are considered Google benchmark files and # should be listed here. diff --git a/third_party/jpeg-xl/lib/jxl_extras.cmake b/third_party/jpeg-xl/lib/jxl_extras.cmake index c81e0ebe3c5a..a63565259812 100644 --- a/third_party/jpeg-xl/lib/jxl_extras.cmake +++ b/third_party/jpeg-xl/lib/jxl_extras.cmake @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. set(JPEGXL_EXTRAS_SOURCES extras/codec.cc diff --git a/third_party/jpeg-xl/lib/jxl_profiler.cmake b/third_party/jpeg-xl/lib/jxl_profiler.cmake index 5ecfd19d8615..8faa62620dd0 100644 --- a/third_party/jpeg-xl/lib/jxl_profiler.cmake +++ b/third_party/jpeg-xl/lib/jxl_profiler.cmake @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. set(JPEGXL_PROFILER_SOURCES profiler/profiler.cc diff --git a/third_party/jpeg-xl/lib/jxl_tests.cmake b/third_party/jpeg-xl/lib/jxl_tests.cmake index c2a4d841b4cf..c1d81219dc9b 100644 --- a/third_party/jpeg-xl/lib/jxl_tests.cmake +++ b/third_party/jpeg-xl/lib/jxl_tests.cmake @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. set(TEST_FILES extras/codec_test.cc diff --git a/third_party/jpeg-xl/lib/jxl_threads.cmake b/third_party/jpeg-xl/lib/jxl_threads.cmake index 0cea13982faa..6941a982e9e7 100644 --- a/third_party/jpeg-xl/lib/jxl_threads.cmake +++ b/third_party/jpeg-xl/lib/jxl_threads.cmake @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. find_package(Threads REQUIRED) diff --git a/third_party/jpeg-xl/lib/lib.gni b/third_party/jpeg-xl/lib/lib.gni index 99857ebf6fb5..a147c4fe4b6d 100644 --- a/third_party/jpeg-xl/lib/lib.gni +++ b/third_party/jpeg-xl/lib/lib.gni @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. # Source files definitions for GN-based build systems. diff --git a/third_party/jpeg-xl/lib/profiler/profiler.cc b/third_party/jpeg-xl/lib/profiler/profiler.cc index 1d4a397f924a..d21ee098f8eb 100644 --- a/third_party/jpeg-xl/lib/profiler/profiler.cc +++ b/third_party/jpeg-xl/lib/profiler/profiler.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/jxl/base/profiler.h" diff --git a/third_party/jpeg-xl/lib/profiler/profiler.h b/third_party/jpeg-xl/lib/profiler/profiler.h index 625a6854abe6..c71f63cb3ffb 100644 --- a/third_party/jpeg-xl/lib/profiler/profiler.h +++ b/third_party/jpeg-xl/lib/profiler/profiler.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_PROFILER_PROFILER_H_ #define LIB_PROFILER_PROFILER_H_ diff --git a/third_party/jpeg-xl/lib/profiler/tsc_timer.h b/third_party/jpeg-xl/lib/profiler/tsc_timer.h index 9d04fd09730a..61ccd5af5925 100644 --- a/third_party/jpeg-xl/lib/profiler/tsc_timer.h +++ b/third_party/jpeg-xl/lib/profiler/tsc_timer.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef LIB_PROFILER_TSC_TIMER_H_ #define LIB_PROFILER_TSC_TIMER_H_ diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc b/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc index 3982a90a8669..b9cf4aa6cd5f 100644 --- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc +++ b/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "jxl/thread_parallel_runner.h" diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc index e03813e524db..5ceede42afdb 100644 --- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc +++ b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "lib/threads/thread_parallel_runner_internal.h" diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h index a38e160ba68a..372c6a895086 100644 --- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h +++ b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. // // C++ implementation using std::thread of a ::JxlParallelRunner. diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc index 507edf50cb4e..7ff260e2f109 100644 --- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc +++ b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "gtest/gtest.h" #include "lib/jxl/base/data_parallel.h" diff --git a/third_party/jpeg-xl/plugins/CMakeLists.txt b/third_party/jpeg-xl/plugins/CMakeLists.txt index c7bc5db74305..40cdf3f9d4e5 100644 --- a/third_party/jpeg-xl/plugins/CMakeLists.txt +++ b/third_party/jpeg-xl/plugins/CMakeLists.txt @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. if(NOT WIN32) add_subdirectory(gdk-pixbuf) diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt b/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt index baabf65d9dce..92a414ea2279 100644 --- a/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt +++ b/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. find_package(PkgConfig) pkg_check_modules(Gdk-Pixbuf IMPORTED_TARGET gdk-pixbuf-2.0>=2.38) diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c b/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c index d61f7fede578..c311a665ae5b 100644 --- a/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c +++ b/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #define GDK_PIXBUF_ENABLE_BACKEND #include diff --git a/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt b/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt index e33ae783dfab..ab3bd1912434 100644 --- a/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt +++ b/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt @@ -1,16 +1,7 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. find_package(PkgConfig) pkg_check_modules(Gimp IMPORTED_TARGET gimp-2.0>=2.10 gimpui-2.0>=2.10) diff --git a/third_party/jpeg-xl/plugins/gimp/common.h b/third_party/jpeg-xl/plugins/gimp/common.h index acd8503181fa..de4079032402 100644 --- a/third_party/jpeg-xl/plugins/gimp/common.h +++ b/third_party/jpeg-xl/plugins/gimp/common.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef PLUGINS_GIMP_COMMON_H_ #define PLUGINS_GIMP_COMMON_H_ diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc b/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc index 183ccdf5216b..8944c88a7c22 100644 --- a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc +++ b/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "plugins/gimp/file-jxl-load.h" diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h b/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h index f8bd68a13e2d..b3a90b6ab644 100644 --- a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h +++ b/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef PLUGINS_GIMP_FILE_JXL_LOAD_H_ #define PLUGINS_GIMP_FILE_JXL_LOAD_H_ diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc b/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc index 82a61d5349b5..40c99b2df0d9 100644 --- a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc +++ b/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include "plugins/gimp/file-jxl-save.h" diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h b/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h index 0da21ccf09dc..8404ea72c5c6 100644 --- a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h +++ b/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #ifndef PLUGINS_GIMP_FILE_JXL_SAVE_H_ #define PLUGINS_GIMP_FILE_JXL_SAVE_H_ diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl.cc b/third_party/jpeg-xl/plugins/gimp/file-jxl.cc index 51a9594ca6fc..55ebd458c50f 100644 --- a/third_party/jpeg-xl/plugins/gimp/file-jxl.cc +++ b/third_party/jpeg-xl/plugins/gimp/file-jxl.cc @@ -1,16 +1,7 @@ -// Copyright (c) the JPEG XL Project +// Copyright (c) the JPEG XL Project Authors. All rights reserved. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. #include #include diff --git a/third_party/jpeg-xl/plugins/mime/CMakeLists.txt b/third_party/jpeg-xl/plugins/mime/CMakeLists.txt index 831f3d692d3a..6f2a0f919c17 100644 --- a/third_party/jpeg-xl/plugins/mime/CMakeLists.txt +++ b/third_party/jpeg-xl/plugins/mime/CMakeLists.txt @@ -1,15 +1,6 @@ -# Copyright (c) the JPEG XL Project +# Copyright (c) the JPEG XL Project Authors. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. install(FILES image-jxl.xml DESTINATION share/mime/packages/)