diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBitmapProcState.cpp | 1 | ||||
-rwxr-xr-x | src/core/SkDistanceFieldGen.cpp | 3 | ||||
-rw-r--r-- | src/core/SkDraw.cpp | 1 | ||||
-rw-r--r-- | src/core/SkScan_AntiPath.cpp | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 900b367b5d..1508f94643 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -361,7 +361,6 @@ bool SkBitmapProcState::chooseScanlineProcs(bool trivialMatrix, bool clampClamp) #endif fSampleProc32 = SK_ARM_NEON_WRAP(gSkBitmapProcStateSample32)[index]; - index >>= 1; // shift away any opaque/alpha distinction // our special-case shaderprocs if (SK_ARM_NEON_WRAP(SI8_opaque_D32_filter_DX) == fSampleProc32 && clampClamp) { diff --git a/src/core/SkDistanceFieldGen.cpp b/src/core/SkDistanceFieldGen.cpp index 187a5bf166..7e4675bbc1 100755 --- a/src/core/SkDistanceFieldGen.cpp +++ b/src/core/SkDistanceFieldGen.cpp @@ -242,9 +242,8 @@ static void F1(DFData* curr, int width) { static void F2(DFData* curr, int width) { // right DFData* check = curr + 1; - float distSq = check->fDistSq; SkPoint distVec = check->fDistVector; - distSq = check->fDistSq + 2.0f*distVec.fX + 1.0f; + float distSq = check->fDistSq + 2.0f*distVec.fX + 1.0f; if (distSq < curr->fDistSq) { distVec.fX += 1.0f; curr->fDistSq = distSq; diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 487b46b05e..34c7d73b3e 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1933,7 +1933,6 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count, if (nullptr == textures) { // just colors (no texture) p.setShader(triShader); - shader = p.getShader(); } else { // colors * texture SkASSERT(shader); diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp index 3b0f3e189b..b41a99c898 100644 --- a/src/core/SkScan_AntiPath.cpp +++ b/src/core/SkScan_AntiPath.cpp @@ -354,7 +354,6 @@ void SuperBlitter::blitRect(int x, int y, int width, int height) { xleft = xrite - xleft; SkASSERT(xleft <= SCALE); SkASSERT(xleft > 0); - xrite = 0; fRealBlitter->blitV(ileft + fLeft, start_y, count, coverage_to_exact_alpha(xleft)); } else { |