changeset 425:3c4fc5111ff2

Merge
author lana
date Thu, 05 Jun 2008 14:18:37 -0700
parents 02e4c5348592 8f1a1b2f77a3
children f0ede391c615
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/font/freetypeScaler.c	Tue Jun 03 11:18:33 2008 -0700
+++ b/src/share/native/sun/font/freetypeScaler.c	Thu Jun 05 14:18:37 2008 -0700
@@ -770,11 +770,9 @@
     glyphInfo->topLeftX  = (float)  ftglyph->bitmap_left;
     glyphInfo->topLeftY  = (float) -ftglyph->bitmap_top;
 
-    if (context->aaType == TEXT_AA_LCD_HRGB ||
-        context->aaType == TEXT_AA_LCD_HBGR) {
+    if (ftglyph->bitmap.pixel_mode ==  FT_PIXEL_MODE_LCD) {
         glyphInfo->width = width/3;
-    } else if (context->aaType == TEXT_AA_LCD_VRGB ||
-               context->aaType == TEXT_AA_LCD_VBGR) {
+    } else if (ftglyph->bitmap.pixel_mode ==  FT_PIXEL_MODE_LCD_V) {
         glyphInfo->height = glyphInfo->height/3;
     }