diff options
Diffstat (limited to 'examples/myfont/glyph_metrics.c')
| -rw-r--r-- | examples/myfont/glyph_metrics.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/examples/myfont/glyph_metrics.c b/examples/myfont/glyph_metrics.c index 9a39b5e..606bd4d 100644 --- a/examples/myfont/glyph_metrics.c +++ b/examples/myfont/glyph_metrics.c @@ -23,9 +23,9 @@ #include <string.h> #include <myfont/myfont.h> -#include <myhtml/encoding.h> +#include <myencoding/encoding.h> -void usage(const char *path, float font_size, unsigned long codepoint) +void usage(const char *path, float font_size, size_t codepoint) { printf("Usage:\n"); printf("\tprogram [char in UTF-8] [font fize in px] [font path]\n"); @@ -35,14 +35,14 @@ void usage(const char *path, float font_size, unsigned long codepoint) int main(int argc, const char * argv[]) { /* set and get params */ - const char *path = "../third_party/font/Arkhip.ttf"; + const char *path = "third_party/font/Arkhip.ttf"; float font_size = 200.0f; - unsigned long codepoint; - myhtml_encoding_ascii_utf_8_to_codepoint((unsigned char*)"x", &codepoint); + size_t codepoint; + myencoding_ascii_utf_8_to_codepoint((unsigned char*)"x", &codepoint); if (argc == 2) { - if(myhtml_encoding_ascii_utf_8_to_codepoint((const unsigned char*)argv[1], &codepoint) == 0) { + if(myencoding_ascii_utf_8_to_codepoint((const unsigned char*)argv[1], &codepoint) == 0) { fprintf(stderr, "Bad char code point\n"); return EXIT_FAILURE; } @@ -67,7 +67,8 @@ int main(int argc, const char * argv[]) myfont_font_t *mf = myfont_create(); myfont_init(mf); - myfont_status_t mf_status = myfont_load(mf, path); + uint8_t *font_data; + mystatus_t mf_status = myfont_load_from_file(mf, path, &font_data, NULL); if(mf_status) { myfont_destroy(mf, true); @@ -83,7 +84,7 @@ int main(int argc, const char * argv[]) } char data[5]; - size_t len = myhtml_encoding_codepoint_to_ascii_utf_8(codepoint, data); + size_t len = myencoding_codepoint_to_ascii_utf_8(codepoint, data); data[len] = '\0'; /* work code */ @@ -102,7 +103,7 @@ int main(int argc, const char * argv[]) printf("Font file: %s\n", path); printf("Font size: %.fpx\n\n", font_size); - printf("Metrics for code point %lu (%s):\n", codepoint, data); + printf("Metrics for code point " MyCORE_FORMAT_Z " (%s):\n", codepoint, data); printf("\tBaseline: %.05f\n", baseline); printf("\tAscender: %.05f\n", ascender); printf("\tDescender: %.05f\n", descender); @@ -135,6 +136,7 @@ int main(int argc, const char * argv[]) printf("</svg>\n"); + myfont_destroy_font_data(mf, font_data); myfont_destroy(mf, true); return 0; |