| Index: src/core/SkDraw.cpp
|
| diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
|
| index d2d618090e39d4e085bbf5cf8174721bbe990b93..df73f7ae3795829c09e40349a8671d805dd19d6c 100644
|
| --- a/src/core/SkDraw.cpp
|
| +++ b/src/core/SkDraw.cpp
|
| @@ -1156,7 +1156,7 @@ static bool just_translate(const SkMatrix& matrix, const SkBitmap& bitmap) {
|
|
|
| void SkDraw::drawBitmapAsMask(const SkBitmap& bitmap,
|
| const SkPaint& paint) const {
|
| - SkASSERT(bitmap.getConfig() == SkBitmap::kA8_Config);
|
| + SkASSERT(bitmap.config() == SkBitmap::kA8_Config);
|
|
|
| if (just_translate(*fMatrix, bitmap)) {
|
| int ix = SkScalarRound(fMatrix->getTranslateX());
|
| @@ -1264,7 +1264,7 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
|
| // nothing to draw
|
| if (fRC->isEmpty() ||
|
| bitmap.width() == 0 || bitmap.height() == 0 ||
|
| - bitmap.getConfig() == SkBitmap::kNo_Config) {
|
| + bitmap.config() == SkBitmap::kNo_Config) {
|
| return;
|
| }
|
|
|
| @@ -1290,7 +1290,7 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
|
| }
|
| }
|
|
|
| - if (bitmap.getConfig() != SkBitmap::kA8_Config &&
|
| + if (bitmap.config() != SkBitmap::kA8_Config &&
|
| just_translate(matrix, bitmap)) {
|
| //
|
| // It is safe to call lock pixels now, since we know the matrix is
|
| @@ -1323,7 +1323,7 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
|
| SkDraw draw(*this);
|
| draw.fMatrix = &matrix;
|
|
|
| - if (bitmap.getConfig() == SkBitmap::kA8_Config) {
|
| + if (bitmap.config() == SkBitmap::kA8_Config) {
|
| draw.drawBitmapAsMask(bitmap, paint);
|
| } else {
|
| SkAutoBitmapShaderInstall install(bitmap, paint);
|
| @@ -1343,7 +1343,7 @@ void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y,
|
| // nothing to draw
|
| if (fRC->isEmpty() ||
|
| bitmap.width() == 0 || bitmap.height() == 0 ||
|
| - bitmap.getConfig() == SkBitmap::kNo_Config) {
|
| + bitmap.config() == SkBitmap::kNo_Config) {
|
| return;
|
| }
|
|
|
|
|