From 748f1096bd2b6deb34246be3426fd4f3450eb954 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Thu, 11 Oct 2018 16:30:58 +0200 Subject: [PATCH] [kandinksy] Clean up the rasterizer --- kandinsky/fonts/rasterizer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kandinsky/fonts/rasterizer.c b/kandinsky/fonts/rasterizer.c index c4d79073c..9fba35a91 100644 --- a/kandinsky/fonts/rasterizer.c +++ b/kandinsky/fonts/rasterizer.c @@ -48,7 +48,7 @@ void writeImageToPNGFile(image_t * image, char * filename); #define GRID_WIDTH 19 #define GRID_HEIGHT 8 -#if (GRID_WIDTH*GRID_HEIGHT < (NUMBER_OF_SYMBOLS+CHARACTER_RANGE_END-CHARACTER_RANGE_START+1)) +#if (GRID_WIDTH*GRID_HEIGHT < GLYPH_COUNT) #error Grid too small. Consider increasing GRID_WIDTH or GRID_HEIGHT #endif @@ -87,7 +87,7 @@ int main(int argc, char * argv[]) { char * font_name = argv[4]; char * output_cpp = argv[5]; #ifdef GENERATE_PNG - char * output_png = argv[7]; + char * output_png = argv[6]; #endif ENSURE(!FT_Init_FreeType(&library), "Initializing library"); @@ -239,6 +239,8 @@ int main(int argc, char * argv[]) { LZ4HC_CLEVEL_MAX ); + ENSURE(sizeOfCompressedGlyphBuffer > 0, "Could not compress glyph %d", character); + glyphDataOffset[character] = lastOffset; lastOffset += sizeOfCompressedGlyphBuffer; }