summaryrefslogtreecommitdiffstats
path: root/libs/hwui
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-09-19 15:49:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-19 15:49:49 -0700
commitab99b39d7d152de35ea02a364190ff325da4015b (patch)
treed4742fdb4271ef0288ece6f4c7113f759f98665a /libs/hwui
parent638918a2681cff345b9e3bd5ff7b170a874125dc (diff)
parentddc0a63d8fce1f6b78e56040d09ee208336fc7a2 (diff)
downloadframeworks_base-ab99b39d7d152de35ea02a364190ff325da4015b.zip
frameworks_base-ab99b39d7d152de35ea02a364190ff325da4015b.tar.gz
frameworks_base-ab99b39d7d152de35ea02a364190ff325da4015b.tar.bz2
am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev
* commit 'ddc0a63d8fce1f6b78e56040d09ee208336fc7a2': fix emoji clipping in hw draw path
Diffstat (limited to 'libs/hwui')
-rw-r--r--libs/hwui/FontRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 7e99a5f..00e7870 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -353,7 +353,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp
memset(dstR += dstStride, 0, borderSize); // trailing border column
}
// write trailing border line
- memset(dstL, 0, rowSize + 2 * borderSize);
+ memset(dstL += dstStride, 0, rowSize + 2 * borderSize);
break;
}
case SkMask::kBW_Format: {