diff --git a/build_linux64/libamscimglib4.linux64.so b/build_linux64/libamscimglib4.linux64.so index c48ace3..6500a61 100644 Binary files a/build_linux64/libamscimglib4.linux64.so and b/build_linux64/libamscimglib4.linux64.so differ diff --git a/build_linux64/libamsfontconverter4.linux64.a b/build_linux64/libamsfontconverter4.linux64.a index 42dd264..4c7ac00 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 3ea05a6..e2a0af6 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_tests1.o b/build_linux64/objstore/amsfontconverter4_tests1.o index 54b4219..09c487f 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 c27886a..fdfb4ae 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/build_mingw64/libamscimglib4.winx64.dll b/build_mingw64/libamscimglib4.winx64.dll index 0e6e243..3392d85 100644 Binary files a/build_mingw64/libamscimglib4.winx64.dll and b/build_mingw64/libamscimglib4.winx64.dll differ diff --git a/build_mingw64/libamsfontconverter4.mingw64.a b/build_mingw64/libamsfontconverter4.mingw64.a index 803b767..300447a 100644 Binary files a/build_mingw64/libamsfontconverter4.mingw64.a and b/build_mingw64/libamsfontconverter4.mingw64.a differ diff --git a/build_mingw64/objstore/amsfontconverter4_freetypeffloader.o b/build_mingw64/objstore/amsfontconverter4_freetypeffloader.o new file mode 100644 index 0000000..178f556 Binary files /dev/null and b/build_mingw64/objstore/amsfontconverter4_freetypeffloader.o differ diff --git a/build_mingw64/objstore/amsfontconverter4_template.o b/build_mingw64/objstore/amsfontconverter4_template.o index d737a3e..6f1e57a 100644 Binary files a/build_mingw64/objstore/amsfontconverter4_template.o and b/build_mingw64/objstore/amsfontconverter4_template.o differ diff --git a/build_mingw64/objstore/amsfontconverter4_tests1.o b/build_mingw64/objstore/amsfontconverter4_tests1.o new file mode 100644 index 0000000..34adf46 Binary files /dev/null and b/build_mingw64/objstore/amsfontconverter4_tests1.o differ diff --git a/build_mingw64/tests.exe b/build_mingw64/tests.exe index d2c8b65..2a3c67d 100644 Binary files a/build_mingw64/tests.exe and b/build_mingw64/tests.exe differ diff --git a/include/amsfontconverter4/amsfontconverter4.hpp b/include/amsfontconverter4/amsfontconverter4.hpp index 8c6fa4f..225e634 100644 --- a/include/amsfontconverter4/amsfontconverter4.hpp +++ b/include/amsfontconverter4/amsfontconverter4.hpp @@ -55,19 +55,18 @@ namespace font4 }; + int ft_load_glyphrange( + const char *fname, + int charheight, + uint32_t charindmin, + uint32_t charindmax, + amsglyphrange *glyphrange_out + ); -/////////// -// Tests // -/////////// - -void test_printglyph(amsbitplane *glyph); -void test_getglyph1(); -void test_getglyph2(); -void test_facemetrics(); -void test_glyphrange_load(); - }; }; +#include + #endif \ No newline at end of file diff --git a/include/amsfontconverter4/amsfontconverter4_tests.hpp b/include/amsfontconverter4/amsfontconverter4_tests.hpp new file mode 100644 index 0000000..3fd2a11 --- /dev/null +++ b/include/amsfontconverter4/amsfontconverter4_tests.hpp @@ -0,0 +1,24 @@ +#ifndef __AMSFONTCONVERTER4_TESTS_HPP__ +#define __AMSFONTCONVERTER4_TESTS_HPP__ + + +namespace ams +{ +namespace font4 +{ + +/////////// +// Tests // +/////////// + +void test_printglyph(amsbitplane *glyph); +void test_getglyph1(); +void test_getglyph2(); +void test_facemetrics(); +void test_glyphrange_load(); +void test_load_fontfamily1(); + +}; +}; + +#endif \ No newline at end of file diff --git a/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp b/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp index bdc9a9c..7c7279f 100644 --- a/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp +++ b/src/amsfontconverter4/amsfontconverter4_freetypeffloader.cpp @@ -21,7 +21,7 @@ freetype_fontfaceloader::~freetype_fontfaceloader() int freetype_fontfaceloader::open(const char *fontfilename) { - int ret = 0; + int ret = fontconverter4_failure; int error; error = FT_Init_FreeType(&(library)); @@ -32,21 +32,22 @@ int freetype_fontfaceloader::open(const char *fontfilename) error = FT_New_Face(library,fontfilename,0,&face); if(!error) { - ret = 1; + ret = fontconverter4_success; bopen = 1; } else { - ret = 0; + ret = fontconverter4_failure; bopen=0; printf("freetype fontfaceloader: Error: Could not load file %s\n",fontfilename); + } } else { blibinit = 0; printf("freetype fontfaceloader: Error: FT_Init_FreeType failed.\n"); - ret = -1; + ret = fontconverter4_failure; } return ret; @@ -235,8 +236,8 @@ int freetype_fontfaceloader::load_glyphrange( getglyph( (uint32_t) I, charheight, - &(glyphrange_out->glyphs[I]), - &(glyphrange_out->metrics[I]) + &(glyphrange_out->glyphs[I-charindmin]), + &(glyphrange_out->metrics[I-charindmin]) ); } @@ -251,5 +252,62 @@ int freetype_fontfaceloader::load_glyphrange( return ret; } + + +int ft_load_glyphrange( + const char *fname, + int charheight, + uint32_t charindmin, + uint32_t charindmax, + amsglyphrange *glyphrange_out +) +{ + long I; + int ret = fontconverter4_success; + int res; + freetype_fontfaceloader ftloader; + + if(glyphrange_out==NULL) + { + ret = fontconverter4_failure; + return ret; + } + + res = ftloader.open(fname); + if(ftloader.bopen==0) + { + ret = fontconverter4_failure; + return ret; + } + + *glyphrange_out = amsglyphrange(); + + charindmax = (charindmaxcharheight = charheight; + glyphrange_out->charindmin = charindmin; + glyphrange_out->charindmax = charindmax; + glyphrange_out->fontfacemetrics = ftloader.getfacemetrics(charheight); + + glyphrange_out->metrics.resize(charindmax-charindmin); + glyphrange_out->glyphs.resize(charindmax-charindmin); + + for(I=charindmin;Iglyphs[I-charindmin]), + &(glyphrange_out->metrics[I-charindmin]) + ); + } + + glyphrange_out->docalculations(); + + ftloader.close(); + return ret; +} + + }; }; \ No newline at end of file diff --git a/src/amsfontconverter4/amsfontconverter4_tests1.cpp b/src/amsfontconverter4/amsfontconverter4_tests1.cpp index e1b7078..b255996 100644 --- a/src/amsfontconverter4/amsfontconverter4_tests1.cpp +++ b/src/amsfontconverter4/amsfontconverter4_tests1.cpp @@ -121,5 +121,57 @@ void test_glyphrange_load() return; } +void test_load_fontfamily1() +{ + printf("Test loading a font family.\n"); + + int res; + int I; + + int charheight = 30; + amsglyphrange gr; + amsfontfamily amsff; + + const char *nfont = "../inputfonts/FreeMono.ttf"; + const char *bfont = "../inputfonts/FreeMonoBold.ttf"; + const char *ifont = "../inputfonts/FreeMonoOblique.ttf"; + const char *bifont = "../inputfonts/FreeMonoBoldOblique.ttf"; + + res = ft_load_glyphrange(nfont,charheight,0,256,&gr); + gr.typefacetype = typefacetype_normal; + amsff.addrange(gr); + + res = ft_load_glyphrange(bfont,charheight,0,256,&gr); + gr.typefacetype = typefacetype_bold; + amsff.addrange(gr); + + res = ft_load_glyphrange(ifont,charheight,0,256,&gr); + gr.typefacetype = typefacetype_italic; + amsff.addrange(gr); + + res = ft_load_glyphrange(bifont,charheight,0,256,&gr); + gr.typefacetype = typefacetype_bolditalic; + amsff.addrange(gr); + + res = ft_load_glyphrange(bifont,charheight,256,512,&gr); + gr.typefacetype = typefacetype_bolditalic; + amsff.addrange(gr); + + res = ft_load_glyphrange(nfont,charheight,256,512,&gr); + gr.typefacetype = typefacetype_normal; + amsff.addrange(gr); + + + + + + + + amsff.print(); + + + return; +} + }; }; \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 252aaf0..06ac14d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,7 @@ #include +using namespace ams::font4; + int main(int argc, char* argv[]) { int ret = 0; @@ -7,7 +9,9 @@ int main(int argc, char* argv[]) //ams::font4::test_getglyph1(); //ams::font4::test_getglyph2(); //ams::font4::test_facemetrics(); - ams::font4::test_glyphrange_load(); + //ams::font4::test_glyphrange_load(); + + test_load_fontfamily1(); return ret; } \ No newline at end of file