diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-04 22:48:25 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-04 22:48:25 +0000 |
commit | bf4338cb3bd06f9488b7d36fef083c8eb0f3f56a (patch) | |
tree | f36cc394346682320ab677fda95fa270d4f5f9f5 /gpu | |
parent | 6f8f292aa768869a9e85c314b124875f57504f2c (diff) |
Fix Sample App on Win32 GL window resize, fix sk->gr convexity hint, fix grpath uninit warnings
Review URL http://codereview.appspot.com/4247055/
git-svn-id: http://skia.googlecode.com/svn/trunk@895 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/include/GrPathIter.h | 2 | ||||
-rw-r--r-- | gpu/src/GrPath.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gpu/include/GrPathIter.h b/gpu/include/GrPathIter.h index f310184bd7..55427c0b22 100644 --- a/gpu/include/GrPathIter.h +++ b/gpu/include/GrPathIter.h @@ -50,7 +50,7 @@ public: * * @return a hint about the convexity of the path. */ - virtual GrConvexHint convexHint() const { return kNone_ConvexHint; } + virtual GrConvexHint convexHint() const = 0; /** * Iterates through the path. Should not be called after diff --git a/gpu/src/GrPath.cpp b/gpu/src/GrPath.cpp index 019b2fd5c4..1e5a6cf18b 100644 --- a/gpu/src/GrPath.cpp +++ b/gpu/src/GrPath.cpp @@ -152,24 +152,24 @@ void GrPath::resetFromIter(GrPathIter* iter) { fConvexHint = iter->convexHint(); // first point of the subpath - GrPoint firstPt; + GrPoint firstPt(0,0); // first edge of the subpath - GrVec firstVec; + GrVec firstVec(0,0); // vec of most recently processed edge, that wasn't degenerate - GrVec previousVec; + GrVec previousVec(0,0); // most recently processed point - GrPoint previousPt; + GrPoint previousPt(0,0); // sign indicates whether we're bending left or right - GrScalar turnDir; + GrScalar turnDir = 0; // number of times the direction has flipped in x or y // we track which direction we are moving in x/y and the // number of times it changes. - int xDir; - int yDir; - int flipX; - int flipY; + int xDir = 0; + int yDir = 0; + int flipX = 0; + int flipY = 0; // counts number of sub path pts that didn't add a degenerate edge. int subPathPts = 0; |