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.

Sign up for GitHub

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

Add the missing SKColorFilter types #2882

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add the missing SKColorFilter types #2882

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d94269
Add the missing SKColorFilter types
mattleibow Jun 1, 2024
903814d
Add generated APIs
mattleibow Jun 3, 2024
8817ef1
Merge branch 'main' into dev/colorfilters
mattleibow Sep 18, 2024
a935287
added C# API and tests
mattleibow Sep 18, 2024
a23ce75
fixed the test
mattleibow Sep 18, 2024
d874df4
Merge remote-tracking branch 'origin/main' into dev/colorfilters
mattleibow Sep 28, 2024
7cc2760
Merge remote-tracking branch 'origin/main' into dev/colorfilters
mattleibow Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'origin/main' into dev/colorfilters 
# Conflicts:
#	externals/skia
  • Loading branch information
@mattleibow
mattleibow committed Oct 28, 2024
commit 7cc2760afaa6eb3c248a01118eea6a192e9421e2
34 changes: 25 additions & 9 deletions .github/ISSUE_TEMPLATE/bug-report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,24 @@ body:
label: Version of SkiaSharp
description: What version of SkiaSharp are you using?
options:
- 3.x (Alpha)
- 2.88.4-preview (Preview)
- 2.88.3 (Current)
- 2.88.2 (Previous)
- 3.x-preview.4 (Current Preview)
- 3.x-preview.3 (Previous Preview)
- 3.x-preview.2 (Deprecated)
- 3.x-preview.1 (Deprecated)
- 2.88.9-preview.1 (Preview)
- 2.88.8 (Current)
- 2.88.7 (Previous)
- 2.88.6 (Deprecated)
- 2.88.5 (Deprecated)
- 2.88.4 (Deprecated)
- 2.88.3 (Deprecated)
- 2.88.2 (Deprecated)
- 2.88.1 (Deprecated)
- 2.88.0 (Deprecated)
- 2.80.x (Deprecated)
- 2.80.x (Obsolete)
- 1.x (Obsolete)
- Other (Please indicate in the description)
default: 2
default: 6
- type: dropdown
id: goodversion
validations:
Expand All @@ -88,13 +96,21 @@ body:
label: Last Known Good Version of SkiaSharp
description: What version of SkiaSharp still did what you expected?
options:
- 2.88.2 (Previous)
- 3.x-preview.3 (Previous Preview)
- 3.x-preview.2 (Deprecated)
- 3.x-preview.1 (Deprecated)
- 2.88.7 (Previous)
- 2.88.6 (Deprecated)
- 2.88.5 (Deprecated)
- 2.88.4 (Deprecated)
- 2.88.3 (Deprecated)
- 2.88.2 (Deprecated)
- 2.88.1 (Deprecated)
- 2.88.0 (Deprecated)
- 2.80.x (Deprecated)
- 2.80.x (Obsolete)
- 1.x (Obsolete)
- Other (Please indicate in the description)
default: 0
default: 4
- type: dropdown
id: ide
validations:
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp/SKPixmap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public bool Encode (SKWStream dst, SKEncodedImageFormat encoder, int quality) =>
SKEncodedImageFormat.Jpeg =>
Encode (dst, new SKJpegEncoderOptions (quality)),
SKEncodedImageFormat.Png =>
Encode (dst, new SKPngEncoderOptions ()),
Encode (dst, SKPngEncoderOptions.Default),
SKEncodedImageFormat.Webp when quality == 100 =>
Encode (dst, new SKWebpEncoderOptions (SKWebpEncoderCompression.Lossless, 75)),
SKEncodedImageFormat.Webp =>
Expand Down
2 changes: 1 addition & 1 deletion externals/depot_tools
Open in desktop
Submodule depot_tools updated from f44f21 to ecad42
2 changes: 1 addition & 1 deletion externals/skia
Open in desktop
Submodule skia updated 3 files
+1 −1 DEPS
+1 −1 bazel/deps.bzl
+9 −3 third_party/expat/include/expat_config/expat_config.h
2 changes: 1 addition & 1 deletion scripts/Docker/debian/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Arguments:
# DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ]

FROM amd64/debian:10
FROM amd64/debian:11

# Install the required packages
RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion scripts/Docker/debian/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Arguments:
# DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ]

FROM arm64v8/debian:10
FROM arm64v8/debian:11

# Install the required packages
RUN apt-get update \
Expand Down
6 changes: 3 additions & 3 deletions scripts/Docker/debian/clang-cross/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
# FONTCONFIG_VERSION - the exact version of libfontconfig1 to use [ 2.13.1-2 | * ]

ARG IMAGE_ARCH=amd64
FROM ${IMAGE_ARCH}/debian:10
FROM ${IMAGE_ARCH}/debian:11

# Install the required packages
RUN apt-get update \
&& apt-get install -y \
curl python3 git clang-13 ninja-build \
curl python3 git clang-13 ninja-build xz-utils \
&& rm -rf /var/lib/apt/lists/*

# Install the cross-compilation GCC toolchain
ARG TOOLCHAIN_VERSION=8
ARG TOOLCHAIN_VERSION=9
ARG TOOLCHAIN_ARCH=arm-linux-gnueabihf
ARG TOOLCHAIN_ARCH_SHORT=armhf
RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ variables:
VISUAL_STUDIO_VERSION: ''
DOTNET_VERSION: '8.0.304'
DOTNET_VERSION_PREVIEW: ''
DOTNET_WORKLOAD_SOURCE: ''
DOTNET_WORKLOAD_SOURCE: 'https://github.com/dotnet/maui/releases/download/8.0.82/8.0.82.json'
DOTNET_WORKLOAD_TIZEN: '8.0.149'
CONFIGURATION: 'Release'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.