Chromium Code Reviews| Index: src/core/SkBitmapProcState.cpp |
| diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp |
| index c1692881dc28bb8c6f0b9ba1de27218a6fb38560..9f15ca310032e67c9879466694d6ca4d23ff51a5 100644 |
| --- a/src/core/SkBitmapProcState.cpp |
| +++ b/src/core/SkBitmapProcState.cpp |
| @@ -137,7 +137,9 @@ bool SkBitmapProcInfo::init(const SkMatrix& inv, const SkPaint& paint) { |
| return false; |
| } |
| fPixmap = fBMState->pixmap(); |
| + //SkASSERT(fPixmap.colorType() == fProvider.info().colorType()); |
|
reed1
2016/03/22 19:17:45
can we restore this assert? do we want to?
herb_g
2016/03/22 20:26:57
I should remove this assert. I think we proved to
|
| fInvMatrix = fBMState->invMatrix(); |
| + fRealInvMatrix = fBMState->invMatrix(); |
| fPaintColor = paint.getColor(); |
| fFilterQuality = fBMState->quality(); |
| SkASSERT(fPixmap.addr()); |
| @@ -198,7 +200,7 @@ bool SkBitmapProcInfo::init(const SkMatrix& inv, const SkPaint& paint) { |
| fFilterQuality = kNone_SkFilterQuality; |
| } |
| } |
| - |
| + |
| return true; |
| } |
| @@ -332,7 +334,7 @@ bool SkBitmapProcState::chooseScanlineProcs(bool trivialMatrix, bool clampClamp) |
| S4444_alpha_D32_filter_DXDY, |
| S4444_opaque_D32_filter_DX, |
| S4444_alpha_D32_filter_DX, |
| - |
| + |
| // A8 treats alpha/opaque the same (equally efficient) |
| SA8_alpha_D32_nofilter_DXDY, |
| SA8_alpha_D32_nofilter_DXDY, |
| @@ -342,7 +344,7 @@ bool SkBitmapProcState::chooseScanlineProcs(bool trivialMatrix, bool clampClamp) |
| SA8_alpha_D32_filter_DXDY, |
| SA8_alpha_D32_filter_DX, |
| SA8_alpha_D32_filter_DX, |
| - |
| + |
| // todo: possibly specialize on opaqueness |
| SG8_alpha_D32_nofilter_DXDY, |
| SG8_alpha_D32_nofilter_DXDY, |