Revert "Merge glyph and outline bitmap better"

This reverts commit d3cd5b0148d64ae0f6e288e69b09acfe639fdcce.
This hack improved blending in few situations, but at the same time
broke it in lots o others; get rid of it.

diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c
index faddcf3905fef8ee9624082073bd7c024a3ee0da..e2018ce1b3b5c6bc1be8bcd2db0c497623ccad41 100644 (file)
--- a/libass/ass_bitmap.c
+++ b/libass/ass_bitmap.c
@@ -261,7 +261,7 @@ static Bitmap *fix_outline_and_shadow(Bitmap *bm_g, Bitmap *bm_o)
             unsigned char c_g, c_o;
             c_g = g[x];
             c_o = o[x];
-            o[x] = (c_o > (3 * c_g) / 5) ? c_o - (3 * c_g) / 5 : 0;
+            o[x] = (c_o > c_g) ? c_o - (c_g / 2) : 0;
             s[x] = (c_o < 0xFF - c_g) ? c_o + c_g : 0xFF;
         }
         g += bm_g->w;