forked from Blendman974/faceclaw
Better rendering of color emojis
This commit is contained in:
1 parent
c6fa3647ae
commit
d1f9f76abb
8 files changed
+336
-32
No files matched your search
@@ -167,6 +167,7 @@ class FontFileRenderer private constructor() {
|
||||
* [width u16][height u16]
|
||||
* [width*height coverage bytes, gamma-mapped]
|
||||
* An ink-free glyph (space) has width = height = 0 but a valid advance.
|
||||
* A color glyph (emoji) carries its ColorGlyphArt shade as its coverage.
|
||||
* Empty array when the font cannot be loaded or the render fails.
|
||||
*/
|
||||
@JvmStatic
|
||||
@@ -196,11 +197,16 @@ class FontFileRenderer private constructor() {
|
||||
}
|
||||
val penX = pad - bounds.left
|
||||
val baselineY = pad - bounds.top
|
||||
val bitmap = Bitmap.createBitmap(bw, bh, Bitmap.Config.ALPHA_8)
|
||||
// Drawn in color: an emoji the system fallback supplies from a color font
|
||||
// would keep only its silhouette in an alpha-only bitmap. ColorGlyphArt shades
|
||||
// color glyphs and passes white ones through as their alpha.
|
||||
val bitmap = Bitmap.createBitmap(bw, bh, Bitmap.Config.ARGB_8888)
|
||||
val canvas = Canvas(bitmap)
|
||||
canvas.drawText(text, penX.toFloat(), baselineY.toFloat(), paint)
|
||||
val pixels = alpha8Pixels(bitmap, bw, bh)
|
||||
val argb = IntArray(bw * bh)
|
||||
bitmap.getPixels(argb, 0, bw, 0, 0, bw, bh)
|
||||
bitmap.recycle()
|
||||
val pixels = ColorGlyphArt.coverage(argb)
|
||||
|
||||
// Trim to the tight ink box; bearing/inkTop become pen- and
|
||||
// line-relative inside the shared packer.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#import "FaceclawFontRenderer.h"
|
||||
#import <CoreText/CoreText.h>
|
||||
#import <CoreGraphics/CoreGraphics.h>
|
||||
#import <FaceclawKit/FaceclawKit.h>
|
||||
#import <math.h>
|
||||
|
||||
// Immutable font descriptors may be shared; layout objects never cross threads.
|
||||
@@ -42,8 +43,9 @@ static BOOL HasColorRun(CTLineRef line) {
|
||||
}
|
||||
// iOS falls back to Apple Color Emoji for default-text symbols the face lacks
|
||||
// (▶ U+25B6 in Roboto), where Android's minikin picks a text font; the
|
||||
// alpha-only raster keeps just the emoji's silhouette (▶ becomes a solid
|
||||
// rounded square). Request text presentation (U+FE0E) for each lone codepoint
|
||||
// emoji is a tile (▶ becomes a rounded square: a silhouette in the alpha-only
|
||||
// line rasters, a shaded tile in glyph cells), which reads worse than the
|
||||
// text symbol. Request text presentation (U+FE0E) for each lone codepoint
|
||||
// that fell back to a color font, wherever a text font can supply it. Returns
|
||||
// `text` itself when nothing changes.
|
||||
static NSString *PreferTextPresentation(CTFontRef font, NSString *text, CTLineRef line, BOOL glyphLayout) {
|
||||
@@ -78,18 +80,34 @@ static BOOL ValidText(NSString *text) { return text != nil && text.length <= 100
|
||||
static BOOL ValidRaster(NSInteger width, NSInteger height) {
|
||||
return width > 0 && height > 0 && width <= 65535 && height <= 65535 && width * height <= 4000000;
|
||||
}
|
||||
static void ConfigureTextContext(CGContextRef ctx) {
|
||||
CGContextSetShouldAntialias(ctx, true);
|
||||
CGContextSetShouldSmoothFonts(ctx, false); // Grayscale coverage, never LCD subpixel color.
|
||||
CGContextSetShouldSubpixelPositionFonts(ctx, true);
|
||||
CGContextSetShouldSubpixelQuantizeFonts(ctx, false);
|
||||
CGContextSetTextMatrix(ctx, CGAffineTransformIdentity);
|
||||
}
|
||||
static CGContextRef CreateContext(NSMutableData *pixels, NSInteger width, NSInteger height) CF_RETURNS_RETAINED {
|
||||
CGContextRef ctx = CGBitmapContextCreate(pixels.mutableBytes, width, height, 8, width, NULL, (CGBitmapInfo)kCGImageAlphaOnly);
|
||||
if (ctx) {
|
||||
CGContextSetShouldAntialias(ctx, true);
|
||||
CGContextSetShouldSmoothFonts(ctx, false); // Grayscale coverage, never LCD subpixel color.
|
||||
CGContextSetShouldSubpixelPositionFonts(ctx, true);
|
||||
CGContextSetShouldSubpixelQuantizeFonts(ctx, false);
|
||||
CGContextSetTextMatrix(ctx, CGAffineTransformIdentity);
|
||||
ConfigureTextContext(ctx);
|
||||
CGContextSetGrayFillColor(ctx, 1, 1);
|
||||
}
|
||||
return ctx;
|
||||
}
|
||||
// Premultiplied RGBA bytes, for a line with a color (emoji) run: an alpha-only raster keeps
|
||||
// just the emoji's silhouette, so its colors go to ColorGlyphArt to be shaded instead.
|
||||
static CGContextRef CreateColorContext(NSMutableData *pixels, NSInteger width, NSInteger height) CF_RETURNS_RETAINED {
|
||||
CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
|
||||
CGContextRef ctx = CGBitmapContextCreate(pixels.mutableBytes, width, height, 8, width * 4, space,
|
||||
(CGBitmapInfo)kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
|
||||
CGColorSpaceRelease(space);
|
||||
if (ctx) {
|
||||
ConfigureTextContext(ctx);
|
||||
CGContextSetRGBFillColor(ctx, 1, 1, 1, 1);
|
||||
}
|
||||
return ctx;
|
||||
}
|
||||
static void U16(uint8_t *out, NSInteger value) { out[0] = value & 255; out[1] = (value >> 8) & 255; }
|
||||
static void GammaCopy(uint8_t *dst, const uint8_t *src, NSInteger count, double gamma) {
|
||||
if (!isfinite(gamma) || gamma <= 0) gamma = 1;
|
||||
@@ -150,10 +168,13 @@ static NSData *ImagePacket(NSData *pixels, NSInteger width, NSInteger height, do
|
||||
NSInteger bottom = floor(CGRectGetMinY(bounds)) - 2;
|
||||
NSInteger width = ceil(CGRectGetMaxX(bounds)) + 2 - left, height = top - bottom;
|
||||
if (!ValidRaster(width, height)) { CFRelease(line); CFRelease(font); return [NSData data]; }
|
||||
NSMutableData *pixels = [NSMutableData dataWithLength:width * height];
|
||||
CGContextRef ctx = CreateContext(pixels, width, height);
|
||||
BOOL color = HasColorRun(line);
|
||||
NSMutableData *raster = [NSMutableData dataWithLength:width * height * (color ? 4 : 1)];
|
||||
CGContextRef ctx = color ? CreateColorContext(raster, width, height) : CreateContext(raster, width, height);
|
||||
if (!ctx) { CFRelease(line); CFRelease(font); return [NSData data]; }
|
||||
CGContextSetTextPosition(ctx, -left, -bottom); CTLineDraw(line, ctx); CGContextRelease(ctx);
|
||||
NSData *pixels = color ? [[FaceclawKitIosColorGlyph shared] shadeRgba:raster] : raster;
|
||||
if ((NSInteger)pixels.length != width * height) { CFRelease(line); CFRelease(font); return [NSData data]; }
|
||||
const uint8_t *src = pixels.bytes;
|
||||
NSInteger x0 = width, y0 = height, x1 = -1, y1 = -1;
|
||||
for (NSInteger y = 0; y < height; y++) for (NSInteger x = 0; x < width; x++) if (src[y * width + x]) {
|
||||
|
||||
Reference in new issue
Block a user