Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libjpeg-turbo to 3.0.0 #2583

Merged
merged 15 commits into from
Aug 25, 2023
Merged

Update libjpeg-turbo to 3.0.0 #2583

merged 15 commits into from
Aug 25, 2023

Conversation

mattleibow
Copy link
Contributor

@mattleibow mattleibow commented Aug 24, 2023

Description of Change

Update libjpeg-turbo to 3.0.0

Bugs Fixed

API Changes

None.

Behavioral Changes

None.

Required skia PR

PR Checklist

  • Has tests (if omitted, state reason in description)
  • Rebased on top of main at time of PR
  • Merged related skia PRs
  • Changes adhere to coding standard
  • Updated documentation

github-actions bot and others added 12 commits August 17, 2023 06:54
(cherry picked from commit 75835cc)

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
…2559) (#2560)

(cherry picked from commit d5bcfdf)

Co-authored-by: Jérôme Laban <jerome.laban@nventive.com>
…2563) (#2564)

(cherry picked from commit 7f9951d)

Co-authored-by: Jérôme Laban <jerome.laban@nventive.com>
Truncation will chop off parts, and this will lose value. Flooring outwards ensure that the size touches the edge of the containing rect. This is useful that any partial overhang with integer sizes can be clipped when drawing.

(cherry picked from commit 8fd4dc5)

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
@mattleibow mattleibow added the backport/release/2.x Backport this PR to release/2.x label Aug 24, 2023
@azure-pipelines
Copy link

There was an error handling pipeline event c6db549a-4524-469f-b0f8-a900ae79971d.

@mattleibow mattleibow enabled auto-merge (squash) August 25, 2023 14:55
@mattleibow mattleibow merged commit 89ee4f1 into main Aug 25, 2023
1 check passed
@mattleibow mattleibow deleted the dev/update-libjpeg-v3 branch August 25, 2023 14:55
@github-actions
Copy link

The backport to release/2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/2.x release/2.x
# Navigate to the new working tree
cd .worktrees/backport-release/2.x
# Create a new branch
git switch --create backport/pr-2583-to-release/2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 89ee4f1c6e6bb8cb3af668f185a1266e0ce3cab2
# Push it to GitHub
git push --set-upstream origin backport/pr-2583-to-release/2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/2.x

Then, create a pull request where the base branch is release/2.x and the compare/head branch is backport/pr-2583-to-release/2.x.

mattleibow added a commit that referenced this pull request Jan 9, 2024
This reverts commit 89ee4f1.

# Conflicts:
#	externals/skia
mattleibow added a commit that referenced this pull request Jan 10, 2024
* Revert "Update libjpeg-turbo to 3.0.0 (#2583)"

This reverts commit 89ee4f1.

* Add tests

* submodule
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/release/2.x Backport this PR to release/2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CYBERSECURITY] libjpeg-turbo current version 2.1.3 in SkiaSharp
1 participant