Index: src/core/SkBitmapProcState_matrix.h |
diff --git a/src/core/SkBitmapProcState_matrix.h b/src/core/SkBitmapProcState_matrix.h |
index 42a5ab6e2242cc5ab6a1cad60de664492281c5ee..fbbaeecf4d322567c4bd4c2bebfde7ee32a2169a 100644 |
--- a/src/core/SkBitmapProcState_matrix.h |
+++ b/src/core/SkBitmapProcState_matrix.h |
@@ -64,14 +64,12 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, |
SkPoint pt; |
s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, |
SkIntToScalar(y) + SK_ScalarHalf, &pt); |
- const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1) |
- + bitmap_sampler_inv_bias(s.fInvMatrix.getScaleY()); |
+ const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1) + s.fInvBiasY; |
const unsigned maxY = s.fPixmap.height() - 1; |
// compute our two Y values up front |
*xy++ = PACK_FILTER_Y_NAME(fy, maxY, s.fFilterOneY PREAMBLE_ARG_Y); |
// now initialize fx |
- fx = SkScalarToFractionalInt(pt.fX) - (SkFixedToFractionalInt(one) >> 1) |
- + bitmap_sampler_inv_bias(s.fInvMatrix.getScaleX()); |
+ fx = SkScalarToFractionalInt(pt.fX) - (SkFixedToFractionalInt(one) >> 1) + s.fInvBiasX; |
} |
#ifdef CHECK_FOR_DECAL |
@@ -104,10 +102,8 @@ void AFFINE_FILTER_NAME(const SkBitmapProcState& s, |
SkFixed oneX = s.fFilterOneX; |
SkFixed oneY = s.fFilterOneY; |
- SkFixed fx = SkScalarToFixed(srcPt.fX) - (oneX >> 1) |
- + bitmap_sampler_inv_bias(s.fInvMatrix.getScaleX()); |
- SkFixed fy = SkScalarToFixed(srcPt.fY) - (oneY >> 1) |
- + bitmap_sampler_inv_bias(s.fInvMatrix.getScaleY()); |
+ SkFixed fx = SkScalarToFixed(srcPt.fX) - (oneX >> 1) + s.fInvBiasX; |
reed1
2015/12/16 16:25:03
Is this needed for filtered versions?
f(malita)
2015/12/16 16:45:55
Not sure. The current/main issue with filtered ni
|
+ SkFixed fy = SkScalarToFixed(srcPt.fY) - (oneY >> 1) + s.fInvBiasY; |
SkFixed dx = s.fInvSx; |
SkFixed dy = s.fInvKy; |
unsigned maxX = s.fPixmap.width() - 1; |