diff --git a/build_linux64/libamsfontconverter4.linux64.a b/build_linux64/libamsfontconverter4.linux64.a index 1175d31..42dd264 100644 Binary files a/build_linux64/libamsfontconverter4.linux64.a and b/build_linux64/libamsfontconverter4.linux64.a differ diff --git a/build_linux64/objstore/amsfontconverter4_freetypeffloader.o b/build_linux64/objstore/amsfontconverter4_freetypeffloader.o index 716c545..3ea05a6 100644 Binary files a/build_linux64/objstore/amsfontconverter4_freetypeffloader.o and b/build_linux64/objstore/amsfontconverter4_freetypeffloader.o differ diff --git a/build_linux64/objstore/amsfontconverter4_template.o b/build_linux64/objstore/amsfontconverter4_template.o index 80598ed..b2b405f 100644 Binary files a/build_linux64/objstore/amsfontconverter4_template.o and b/build_linux64/objstore/amsfontconverter4_template.o differ diff --git a/build_linux64/objstore/amsfontconverter4_tests1.o b/build_linux64/objstore/amsfontconverter4_tests1.o index 5d8a4c8..54b4219 100644 Binary files a/build_linux64/objstore/amsfontconverter4_tests1.o and b/build_linux64/objstore/amsfontconverter4_tests1.o differ diff --git a/build_linux64/tests b/build_linux64/tests index 4f43d22..c27886a 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp b/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp index b09f4b6..bdc9a9c 100644 --- a/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp +++ b/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp @@ -188,6 +188,8 @@ facemetrics freetype_fontfaceloader::getfacemetrics(int charheight) FT_Set_Char_Size(face,charheight*64,0,100,0); FT_Set_Transform(face,&matrix,&pen); + // ret.xscale = face->size->metrics.x_scale/64; //this isn't really useful to me as a measurement + // ret.yscale = face->size->metrics.y_scale/64; ret.ascender = face->size->metrics.ascender/64; ret.descender = face->size->metrics.descender/64; ret.max_advance = face->size->metrics.max_advance/64; diff --git a/src/amsfontconverter4/amsfontconverter4_tests1.cpp b/src/amsfontconverter4/amsfontconverter4_tests1.cpp index dfb9456..e1b7078 100644 --- a/src/amsfontconverter4/amsfontconverter4_tests1.cpp +++ b/src/amsfontconverter4/amsfontconverter4_tests1.cpp @@ -98,14 +98,15 @@ void test_glyphrange_load() { int res; int I; - const char *fname = "../inputfonts/LiberationSerif-BoldItalic.ttf"; + //const char *fname = "../inputfonts/LiberationSerif-BoldItalic.ttf"; + const char *fname = "../inputfonts/FreeMono.ttf"; uint32_t charindmin = 0; uint32_t charindmax = 512; freetype_fontfaceloader ftload; amsglyphrange font; - int charheight = 128; + int charheight = 30; ftload.open(fname);