diff --git a/Datas/16x24gruik b/Datas/16x24gruik index ba1641c..cdb5b90 100644 --- a/Datas/16x24gruik +++ b/Datas/16x24gruik @@ -175,28 +175,53 @@ ................ 48 ................ +..************.. +..************.. +................ +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. ................ ................ ................ -......***....... -....**...**..... -....**....**.... -....**....**.... -...***....**.... -..****.....**... -..**.......**... -..**......**.... -..**......**.... -...**.....**.... -..**......**.... -...**......**... -...**.....**.... -...**.....**.... -....**....**.... -....**...**..... -.....*****...... ................ +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. ................ +..************.. +..************.. +................ +56 +................ +..************.. +..************.. +................ +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. +................ +..************.. +..************.. +................ +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. +.**..........**. +................ +..************.. +..************.. ................ 60 ................ diff --git a/Lib/text16x24.c b/Lib/text16x24.c index bb89640..e8856ef 100644 --- a/Lib/text16x24.c +++ b/Lib/text16x24.c @@ -58,7 +58,7 @@ if ( NULL == (fp=Image_must_fopen(fontname, "r", 0)) ) { /* 16 juin 2015 : now we can erase the whole font by setting bit 0 of flags to one */ if (flags & 1) { - fprintf(stderr, "erasing 16x24 font at %p\n", chars_16x24); + fprintf(stderr, "%s: erasing 16x24 font for %s\n", __func__, fontname); memset(chars_16x24, 0, sizeof(chars_16x24)); } @@ -282,7 +282,7 @@ int px, py; char chaine[42]; RGBA paper, ink; -foo = Image_t16x24_txtload(fontname, NULL, 1); +foo = Image_t16x24_txtload(fontname, NULL, flag & 2); if (foo) { fprintf(stderr, "%s: file %s not found\n", __func__, fontname); Image_print_error("fonte 16x24, txtload", foo); diff --git a/Tests/t_t16x24.c b/Tests/t_t16x24.c index f017ff2..421689b 100644 --- a/Tests/t_t16x24.c +++ b/Tests/t_t16x24.c @@ -43,16 +43,22 @@ int main(int argc, char *argv[]) { int foo; -fprintf(stderr, "-------------- %s ------------\n", argv[0]); -foo = Image_t16x24_chars_map("16x24thin", "all16x24chars.tga", 0); -foo = Image_t16x24_chars_map("bigfont.txt", "all16X24chars.tga", 0); -fprintf(stderr, "--------------------------\n"); -Image_print_error("Essai fonte 16x24", foo); +fprintf(stderr, "--------------[ %s ]------------\n", argv[0]); +foo = Image_t16x24_chars_map("16x24thin", "all16x24chars.tga", 0); +if (foo) { Image_print_error("load thin font", foo); } + +foo = Image_t16x24_chars_map("16x24gruik", "all16X24chars.tga", 2); +if (foo) { Image_print_error("load gruik font", foo); } + +fprintf(stderr, "--------------------------\n"); + +/* foo = essai_f1("pov.tga", "/tmp/aaaa_plop.tga", "0123456789"); if (foo) { fprintf(stderr, "essai f1 ---> %d\n", foo); } +*/ return 0; } /*::------------------------------------------------------------------::*/