commit 260db92d4975c50fd929399e8d6875a4c854cd5d
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 14 18:09:32 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 14 18:09:32 2011 +0000
tree 52bcc98f3976e2742ad2482eb2d2adcd74475e8b
parent 8abde0a15d330bda826de3bf0b7bf9a59c514ddf

trim 3-byte column at start and end of freetype bitmap



git-svn-id: http://skia.googlecode.com/svn/trunk@935 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 565d1c3..5497734 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -902,10 +902,10 @@
 #endif
 
 static void copyFT2LCD16(const SkGlyph& glyph, const FT_Bitmap& bitmap) {
-    SkASSERT(glyph.fWidth * 3 == bitmap.width);
+    SkASSERT(glyph.fWidth * 3 == bitmap.width - 6);
     SkASSERT(glyph.fHeight == bitmap.rows);
 
-    const uint8_t* src = bitmap.buffer;
+    const uint8_t* src = bitmap.buffer + 3;
     uint16_t* dst = reinterpret_cast<uint16_t*>(glyph.fImage);
     size_t dstRB = glyph.rowBytes();
     int width = glyph.fWidth;