diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-25 16:54:51 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-25 16:54:51 +0000 |
| commit | 7460b378d68217167013ca889a4cdcae742908e7 (patch) | |
| tree | 7d06cbc4554cf15078d7877c08bfc6c267d7a892 /src/gpu | |
| parent | c1f66214460e88ea96cde2f94798aaad4d2f01a5 (diff) | |
Fixed minor Release & fixed point compiler warnings on Linux
http://codereview.appspot.com/6118050/
git-svn-id: http://skia.googlecode.com/svn/trunk@3766 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrAAHairLinePathRenderer.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/GrDrawState.h | 1 | ||||
| -rw-r--r-- | src/gpu/GrTesselatedPathRenderer.cpp | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index 66dbe8c870..701bf3a08d 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -164,7 +164,7 @@ int num_quad_subdivs(const SkPoint p[3]) { // maybe different when do this using gpu (geo or tess shaders) static const SkScalar gSubdivTol = 175 * SK_Scalar1; - if (dsqd <= gSubdivTol*gSubdivTol) { + if (dsqd <= SkScalarMul(gSubdivTol, gSubdivTol)) { return 0; } else { // subdividing the quad reduces d by 4. so we want x = log4(d/tol) @@ -177,7 +177,9 @@ int num_quad_subdivs(const SkPoint p[3]) { log = GrMin(GrMax(0, log), kMaxSub); return log; #else - SkScalar log = SkScalarLog(SkScalarDiv(dsqd,gSubdivTol*gSubdivTol)); + SkScalar log = SkScalarLog( + SkScalarDiv(dsqd, + SkScalarMul(gSubdivTol, gSubdivTol))); static const SkScalar conv = SkScalarInvert(SkScalarLog(2)); log = SkScalarMul(log, conv); return GrMin(GrMax(0, SkScalarCeilToInt(log)),kMaxSub); diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h index 12c8861104..e5c30b6086 100644 --- a/src/gpu/GrDrawState.h +++ b/src/gpu/GrDrawState.h @@ -460,6 +460,7 @@ public: AutoRenderTargetRestore() : fDrawState(NULL), fSavedTarget(NULL) {} AutoRenderTargetRestore(GrDrawState* ds, GrRenderTarget* newTarget) { fDrawState = NULL; + fSavedTarget = NULL; this->set(ds, newTarget); } ~AutoRenderTargetRestore() { this->set(NULL, NULL); } diff --git a/src/gpu/GrTesselatedPathRenderer.cpp b/src/gpu/GrTesselatedPathRenderer.cpp index 23074d908e..5920ae143b 100644 --- a/src/gpu/GrTesselatedPathRenderer.cpp +++ b/src/gpu/GrTesselatedPathRenderer.cpp @@ -43,8 +43,12 @@ static inline GrDrawState::Edge computeEdge(const GrPoint& p, static inline GrPoint sanitizePoint(const GrPoint& pt) { GrPoint r; - r.fX = SkScalarPin(pt.fX, -kMaxVertexValue, kMaxVertexValue); - r.fY = SkScalarPin(pt.fY, -kMaxVertexValue, kMaxVertexValue); + r.fX = SkScalarPin(pt.fX, + SkFloatToScalar(-kMaxVertexValue), + SkFloatToScalar(kMaxVertexValue)); + r.fY = SkScalarPin(pt.fY, + SkFloatToScalar(-kMaxVertexValue), + SkFloatToScalar(kMaxVertexValue)); return r; } |