summaryrefslogtreecommitdiffstats
path: root/libs/hwui
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-09-20 11:20:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-20 11:20:06 -0700
commit9e233b54b6a421710a43b6dc3efeb01092b25edf (patch)
treebd6de6559bdf6df305211b1a184b0f8ed1c5347e /libs/hwui
parentfa80ffa4fdd8feead2dfaeffb1c06f3ba2806d36 (diff)
parentab99b39d7d152de35ea02a364190ff325da4015b (diff)
downloadframeworks_base-9e233b54b6a421710a43b6dc3efeb01092b25edf.zip
frameworks_base-9e233b54b6a421710a43b6dc3efeb01092b25edf.tar.gz
frameworks_base-9e233b54b6a421710a43b6dc3efeb01092b25edf.tar.bz2
am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev
* commit 'ab99b39d7d152de35ea02a364190ff325da4015b': 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 054a376..67835a4 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: {