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

Jump to bottom

Merge mono #21

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Merge mono #21

wants to merge 27 commits into from

Conversation

Et7f3
Copy link
Member

@Et7f3 Et7f3 commented May 1, 2020

Supersede #20

mattleibow and others added 25 commits September 27, 2019 03:54
@mattleibow
Adding the arm64_32 architecture to watchOS (mono#62)
8c30c13
@mattleibow
Bitcode is just for device builds (mono#63)
bd7b948
@Gillibald @mattleibow
Update freetype to latest release (mono#65)
281628f
@mattleibow
sk_region_contains should return bool (mono#66)
77049b8
@ngocdaothanh @mattleibow
sk_ipoint_t and sk_isize_t should use integer members (mono#67)
caa8bd1
@mattleibow
Just a few fixes for the C API (mono#68)
6c864a6
@mattleibow
This feature is also missing on Nano Server
c7bc33c
@mattleibow
Add isFixedPitch
10be3d7
@mattleibow
Use IsMonospacedFont to detect fixed pitch
9048d00
@mattleibow
DW fixed pitch - use Google's code
0ad7a6b 
https://skia-review.googlesource.com/c/skia/+/255264
@mattleibow
No implementation
33ac8cf
@LeonScroggins @mattleibow
Fix heap buffer overflow
31af8bb 
Bug: oss-fuzz:11040

Because we're sampling, the offset ends up the same as the width. Back
up to the left enough to fit the bytes we will write.

Change-Id: Ie476a0191b66c2322446b9c0922f630d6e971645
Reviewed-on: https://skia-review.googlesource.com/c/164262
Commit-Queue: Leon Scroggins <[email protected]>
Commit-Queue: Mike Klein <[email protected]>
Auto-Submit: Leon Scroggins <[email protected]>
Reviewed-by: Mike Klein <[email protected]>
@LeonScroggins @mattleibow
Ensure fSrcOffsetUnits is in a valid range
b4b86b6 
Bug: oss-fuzz:11114

fSrcOffsetUnits is where we start sampling from the image. It is
computed as

  (sampleX / 2) * fSrcBPP

(ignoring fSrcOffset, which is 0 for a GIF with a subset frame).
sampleX will be no wider than the full image, and we divide it by two to
sample points evenly spread through the image. But for a subset frame,
we need to use a different sampling rate to ensure that the sampled
points are within the width of the frame.

Change-Id: I4a313db096fbaea7d869927a9da5df9beb9f6706
Reviewed-on: https://skia-review.googlesource.com/c/165500
Reviewed-by: Mike Klein <[email protected]>
Commit-Queue: Leon Scroggins <[email protected]>
@mattleibow
Add SkPerlinNoiseShader::MakeImprovedNoise
5029445
@mattleibow
Removed things
3a6e144
@mattleibow
Add a few more members for SkCanvas (mono#72)
acad480
@mattleibow
Adding the SkColor4f (with SkColorSpace) overloads (mono#74)
2186405 
* Add SkColor4f for SkPixmap
* Add the SkShader variants
@mattleibow
Added the rest of SkRegion members
676c098
@mattleibow
Add a few more members to SkImage
2411fe7
@mattleibow
A few changes and fixes. (mono#75)
d3d6d76
@mattleibow
Use wide console output
37fbbc1
@mattleibow
Update the Windows build tools
22c042a
@mattleibow
Support building with VS2017 and VS2019
2638bc7
@mattleibow
lang is not used, so remove it.
6d51638
@Et7f3
(ci): downgrade to windows-2016
b3dc849
@Et7f3 Et7f3 force-pushed the merge-mono branch 5 times, most recently from 6086608 to b8965f4 Compare May 1, 2020 23:30
@Et7f3 Et7f3 force-pushed the merge-mono branch 6 times, most recently from 9929c1b to 265d00e Compare May 2, 2020 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Et7f3 @mattleibow @Gillibald @ngocdaothanh @LeonScroggins