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

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
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]>
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]>
* Add SkColor4f for SkPixmap
* Add the SkShader variants
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants