Ticket #7797: subpix_aa.diff

src/servers/app/FontCacheEntry.cpp

@@ -401 +401 @@
     if (font.Rotation() != 0.0 || font.Shear() != 90.0
         || font.FalseBoldWidth() != 0.0
         || (font.Flags() & B_DISABLE_ANTIALIASING) != 0
-        || font.Size() > 30
-        || !font.Hinting()) {
+        || font.Size() > 30) {
         renderingType = glyph_ren_outline;
     }
 

src/servers/app/FontEngine.cpp

@@ -366 +366 @@
 decompose_ft_bitmap_subpix(const FT_Bitmap& bitmap, int x, int y,
     bool flip_y, Scanline& sl, ScanlineStorage& storage)
 {
-#ifdef AVERAGE_BASED_SUBPIXEL_FILTERING
+#if 1
     const uint8* buf = (const uint8*)bitmap.buffer;
     int pitch = bitmap.pitch;
     sl.reset(x, x + bitmap.width / 3);
@@ -588 +588 @@
     fLastError = FT_Init_FreeType(&fLibrary);
     if (fLastError == 0)
         fLibraryInitialized = true;
+
+    FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
 }
 
 

src/servers/app/drawing/Painter/GlobalSubpixelSettings.h

@@ -17 +17 @@
     HINTING_MODE_MONOSPACED_ONLY
 };
 
-#define AVERAGE_BASED_SUBPIXEL_FILTERING
+//#define AVERAGE_BASED_SUBPIXEL_FILTERING
 
 extern bool gSubpixelAntialiasing;
 extern uint8 gDefaultHintingMode;

headers/libs/freetype2/freetype/config/ftoption.h

@@ -93 +93 @@
   /* This is done to allow FreeType clients to run unmodified, forcing     */
   /* them to display normal gray-level anti-aliased glyphs.                */
   /*                                                                       */
-#if HAIKU_INCLUDE_PATENTED_CODE
-#   define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-#endif
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
   /*************************************************************************/
   /*                                                                       */