diff options
| author | Mike Reed <reed@google.com> | 2014-07-08 12:36:44 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2014-07-08 15:05:38 -0400 |
| commit | 1103b3255945d2eb2fa9c191e84e2270b343cca9 (patch) | |
| tree | 3dd01f46c6a3479974410024250408950ad9859f /libs/hwui/DisplayListOp.h | |
| parent | a3bf3e5c849bfb3bf0a74dcc06ef032355183c2e (diff) | |
| download | frameworks_base-1103b3255945d2eb2fa9c191e84e2270b343cca9.zip frameworks_base-1103b3255945d2eb2fa9c191e84e2270b343cca9.tar.gz frameworks_base-1103b3255945d2eb2fa9c191e84e2270b343cca9.tar.bz2 | |
SkBitmap::Config is deprecated, use SkColorType
Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 901c69e..75d52b4 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -732,7 +732,7 @@ public: deferInfo.mergeable = state.mMatrix.isSimple() && state.mMatrix.positiveScale() && !state.mClipSideFlags && OpenGLRenderer::getXfermodeDirect(mPaint) == SkXfermode::kSrcOver_Mode && - (mBitmap->config() != SkBitmap::kA8_Config); + (mBitmap->colorType() != kAlpha_8_SkColorType); } const SkBitmap* bitmap() { return mBitmap; } |