AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rejigger distance field path rect calcs to avoid underflow

Browse Source 
BUG=skia:4716
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1535173002

Review URL: https://codereview.chromium.org/1535173002
This commit is contained in:
jvanverth 2015-12-18 10:07:52 -08:00 committed by Commit bot
parent b8918c42b7
commit ecbed9d01b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
View File

@ -342,9 +342,15 @@ private:
SkIRect devPathBounds; SkIRect devPathBounds;
scaledBounds.roundOut(&devPathBounds); scaledBounds.roundOut(&devPathBounds);
// pad to allow room for antialiasing // pad to allow room for antialiasing
devPathBounds.outset(SkScalarCeilToInt(kAntiAliasPad), SkScalarCeilToInt(kAntiAliasPad)); const int intPad = SkScalarCeilToInt(kAntiAliasPad);
// move origin to upper left corner // pre-move origin (after outset, will be 0,0)
devPathBounds.offsetTo(0,0); int width = devPathBounds.width();
int height = devPathBounds.height();
devPathBounds.fLeft = intPad;
devPathBounds.fTop = intPad;
devPathBounds.fRight = intPad + width;
devPathBounds.fBottom = intPad + height;
devPathBounds.outset(intPad, intPad);
// draw path to bitmap // draw path to bitmap
SkMatrix drawMatrix; SkMatrix drawMatrix;
@ -381,8 +387,8 @@ private:
// generate signed distance field // generate signed distance field
devPathBounds.outset(SK_DistanceFieldPad, SK_DistanceFieldPad); devPathBounds.outset(SK_DistanceFieldPad, SK_DistanceFieldPad);
int width = devPathBounds.width(); width = devPathBounds.width();
int height = devPathBounds.height(); height = devPathBounds.height();
// TODO We should really generate this directly into the plot somehow // TODO We should really generate this directly into the plot somehow
SkAutoSMalloc<1024> dfStorage(width * height * sizeof(unsigned char)); SkAutoSMalloc<1024> dfStorage(width * height * sizeof(unsigned char));