6587560: OpenJDK problem handling bitmaps returned when LCD text is requested
Reviewed-by: bae, prr
--- a/jdk/src/share/native/sun/font/freetypeScaler.c Wed May 21 10:59:07 2008 +0400
+++ b/jdk/src/share/native/sun/font/freetypeScaler.c Wed May 28 20:06:09 2008 +0400
@@ -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;
}