| Index: src/opts/SkBitmapProcState_opts_SSSE3.cpp
|
| diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp
|
| index bfcd7caa72c9c6971660f550ffe2a36a6ac48886..15a9664c081b7e230857199dd883657f1442ba84 100644
|
| --- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp
|
| +++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp
|
| @@ -395,7 +395,7 @@ void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
|
| int count, uint32_t* colors) {
|
| SkASSERT(count > 0 && colors != NULL);
|
| SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| - SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
|
| + SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
|
| if (has_alpha) {
|
| SkASSERT(s.fAlphaScale < 256);
|
| } else {
|
| @@ -403,8 +403,8 @@ void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
|
| }
|
|
|
| const uint8_t* src_addr =
|
| - static_cast<const uint8_t*>(s.fBitmap->getPixels());
|
| - const size_t rb = s.fBitmap->rowBytes();
|
| + static_cast<const uint8_t*>(s.fPixmap.addr());
|
| + const size_t rb = s.fPixmap.rowBytes();
|
| const uint32_t XY = *xy++;
|
| const unsigned y0 = XY >> 14;
|
| const uint32_t* row0 =
|
| @@ -587,7 +587,7 @@ void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
|
| int count, uint32_t* colors) {
|
| SkASSERT(count > 0 && colors != NULL);
|
| SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
|
| - SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
|
| + SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
|
| if (has_alpha) {
|
| SkASSERT(s.fAlphaScale < 256);
|
| } else {
|
| @@ -595,8 +595,8 @@ void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
|
| }
|
|
|
| const uint8_t* src_addr =
|
| - static_cast<const uint8_t*>(s.fBitmap->getPixels());
|
| - const size_t rb = s.fBitmap->rowBytes();
|
| + static_cast<const uint8_t*>(s.fPixmap.addr());
|
| + const size_t rb = s.fPixmap.rowBytes();
|
|
|
| // vector constants
|
| const __m128i mask_dist_select = _mm_set_epi8(12, 12, 12, 12,
|
|
|