diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkBlitter.cpp | 4 | ||||
-rw-r--r-- | src/core/SkBlitter_4444.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBlitter_A8.cpp | 4 | ||||
-rw-r--r-- | src/core/SkBlitter_ARGB32.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBlitter_RGB16.cpp | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 2010691c00..6bb0db4a45 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -151,7 +151,7 @@ void SkBlitter::blitMask(const SkMask& mask, const SkIRect& clip) { int width = clip.width(); SkAutoSTMalloc<64, int16_t> runStorage(width + 1); int16_t* runs = runStorage.get(); - const uint8_t* aa = mask.getAddr(clip.fLeft, clip.fTop); + const uint8_t* aa = mask.getAddr8(clip.fLeft, clip.fTop); sk_memset16((uint16_t*)runs, 1, width); runs[width] = 0; @@ -513,7 +513,7 @@ public: SkASSERT(fMask->fBounds.contains(x + count - 1, y)); size_t size = fMask->computeImageSize(); - const uint8_t* alpha = fMask->getAddr(x, y); + const uint8_t* alpha = fMask->getAddr8(x, y); const uint8_t* mulp = alpha + size; const uint8_t* addp = mulp + size; diff --git a/src/core/SkBlitter_4444.cpp b/src/core/SkBlitter_4444.cpp index 4035ea3c83..ec62523c5d 100644 --- a/src/core/SkBlitter_4444.cpp +++ b/src/core/SkBlitter_4444.cpp @@ -335,7 +335,7 @@ void SkARGB4444_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) { int height = clip.height(); SkPMColor16* device = fDevice.getAddr16(x, y); - const uint8_t* alpha = mask.getAddr(x, y); + const uint8_t* alpha = mask.getAddr8(x, y); SkPMColor16 srcColor = fPMColor16; unsigned devRB = fDevice.rowBytes() - (width << 1); unsigned maskRB = mask.fRowBytes - width; diff --git a/src/core/SkBlitter_A8.cpp b/src/core/SkBlitter_A8.cpp index 2c44f79cc6..92a4971e84 100644 --- a/src/core/SkBlitter_A8.cpp +++ b/src/core/SkBlitter_A8.cpp @@ -140,7 +140,7 @@ void SkA8_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) { int width = clip.width(); int height = clip.height(); uint8_t* device = fDevice.getAddr8(x, y); - const uint8_t* alpha = mask.getAddr(x, y); + const uint8_t* alpha = mask.getAddr8(x, y); unsigned srcA = fSrcA; while (--height >= 0) { @@ -328,7 +328,7 @@ void SkA8_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) { int width = clip.width(); int height = clip.height(); uint8_t* device = fDevice.getAddr8(x, y); - const uint8_t* alpha = mask.getAddr(x, y); + const uint8_t* alpha = mask.getAddr8(x, y); SkPMColor* span = fBuffer; diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp index 72bc8b769c..599cee2d55 100644 --- a/src/core/SkBlitter_ARGB32.cpp +++ b/src/core/SkBlitter_ARGB32.cpp @@ -29,7 +29,7 @@ static void SkARGB32_Blit32(const SkBitmap& device, const SkMask& mask, int height = clip.height(); SkPMColor* dstRow = device.getAddr32(x, y); - const SkPMColor* srcRow = reinterpret_cast<const SkPMColor*>(mask.getAddr(x, y)); + const SkPMColor* srcRow = reinterpret_cast<const SkPMColor*>(mask.getAddr8(x, y)); do { proc(dstRow, srcRow, width, alpha); diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp index b400dac7a5..8a4d454e9b 100644 --- a/src/core/SkBlitter_RGB16.cpp +++ b/src/core/SkBlitter_RGB16.cpp @@ -208,7 +208,7 @@ void SkRGB16_Black_Blitter::blitMask(const SkMask& mask, SkRGB16_Black_BlitBW(fDevice, mask, clip); } else { uint16_t* SK_RESTRICT device = fDevice.getAddr16(clip.fLeft, clip.fTop); - const uint8_t* SK_RESTRICT alpha = mask.getAddr(clip.fLeft, clip.fTop); + const uint8_t* SK_RESTRICT alpha = mask.getAddr8(clip.fLeft, clip.fTop); unsigned width = clip.width(); unsigned height = clip.height(); unsigned deviceRB = fDevice.rowBytes() - (width << 1); @@ -378,7 +378,7 @@ void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask, } uint16_t* SK_RESTRICT device = fDevice.getAddr16(clip.fLeft, clip.fTop); - const uint8_t* SK_RESTRICT alpha = mask.getAddr(clip.fLeft, clip.fTop); + const uint8_t* SK_RESTRICT alpha = mask.getAddr8(clip.fLeft, clip.fTop); int width = clip.width(); int height = clip.height(); unsigned deviceRB = fDevice.rowBytes() - (width << 1); @@ -638,7 +638,7 @@ void SkRGB16_Blitter::blitMask(const SkMask& mask, } uint16_t* SK_RESTRICT device = fDevice.getAddr16(clip.fLeft, clip.fTop); - const uint8_t* SK_RESTRICT alpha = mask.getAddr(clip.fLeft, clip.fTop); + const uint8_t* SK_RESTRICT alpha = mask.getAddr8(clip.fLeft, clip.fTop); int width = clip.width(); int height = clip.height(); unsigned deviceRB = fDevice.rowBytes() - (width << 1); |