diff --git a/CImg.h b/CImg.h
index 13e65100937e706fb39468572441032cea41e575..7966fad6d7bda23349e7f16395e9cd74a2c12406 100644
--- a/CImg.h
+++ b/CImg.h
@@ -3373,7 +3373,7 @@ namespace cimg_library_suffixed {
const double PI = 3.14159265358979323846; //!< Value of the mathematical constant PI
- // Define a 12x13 binary font (tiny).
+ // Define a 12x13 binary font (small).
static const char *const data_font10x13[] = {
" UwlwnwoyuwHwlwmwcwlwnw[xuwowlwmwoyuwRwlwnxcw Mw (wnwnwuwpwuypwuwoy"
"ZwnwmwuwowuwmwnwnwuwowuwfwuxnwnwmwuwpwuypwuwZwnwnwtwpwtwow'y Hw cwnw >{ jw %xdxZwdw_wexfwYwkw 7yowoyFx=w "
@@ -3425,122 +3425,6 @@ namespace cimg_library_suffixed {
"0x lxdx gw[w=wiw*wbyowoyGwKwowewawcwow YwOwoz Ewjwuwdw 7w 9w Iwnwlw \\w 0|*y[x=wiw,xWw=wKwowewawcwo"
"w Yw hwVx 8w 9w Jxmwnxp" };
- // Define a 13x16 font (small arial).
- static const char *const data_font13x16[] = {
- " i{|}| m{| @y}m{~}r{}~|r{|}x|s{|~{~q{}{}Xy}m{~}r{}~"
- "}r{|~{~s{|~|n{}~|s{|y~q{~}~}d{}y|}t{|y}n{|~|s{|y~|r{}y~}ry}|}X{|~|ny}ry}~q{~|~|p{~} ;y| X{| "
- " c{}|o{}|r{|}{}|s{}|y}q{|{|q{|}|Wy}oy}r{|}{}|r{|{|q{~|p{|~q{~y|}r{|{y|e{|}|}|r{|n{|q{|y{|b{|V{|oy|q{|{y"
- "|r{|{|p{}| \"y}ts|I{}| fy|{|r{|~} Ky~ #{|y}| Wx}|qy}|Kx}|/{|~0{}~| >y|{| dy}|t{}t~|"
- "J{} Y{|u~| h{|}y~|f{~|q{|~|~q{|}{~s{~}~}~v{}~}x{|}s{|y~|q{|~o{|}r{|}n{~;{|}q{}~}|q{|}r{|}y~|s{|}~}|p{}|s{}w~|s{"
- "}y~|t{|v~}t{|}y~|s{|y~}|2{|}y~}sy}y~}|s{}~|sv~}s{|}y~}|uv~}t{}v~}u{}v~}u{|}y~}|t{~|w{~|t{~}ny}t{~|x{}~t{~|ry~vy"
- "~v{~}w{}|v{|}y~}|t{}w~}t{|}y~}|t{}v~|t{}x~|u{}u~}u{~|w{~|w{|~v{~|yy}x{}~x{|~x{|~|x{}~v{|~w{|~|w{|u~}t{|y~|r{~o{"
- "}~}p{}~c{~|e{|}^{}|f{|~|e{~n{|~p{|~r{|}m{~ p{~|!{~}p{~|r{}~<{|}y~|s{|{|}q{}y~|L{~}:{~|K{}~}|p{~|t{}u~|u{}v~}u{|"
- "}y~}qy}s{}u~}v{~y{}|{|}u{|}y~}|e{| {|q{|}y~}gy}x{|}r{~|q{}y~|s{}~|~t{|}x{|}r{|{~M{|}x{|}s{}x~q{}~}e{|~y}qy}|p{~"
- "|d{}x~}X{~q{|}{~g{}~w{|}v{}~w{~u{|y}w{}f{}~|q{}~|q{}~|q{}~|q{}~|q{}~|s{|s~v{|}y~}|u{}v~}u{}v~}u{}v~}u{}v~}sy}py"
- "}py}p{~}rv~}t{~}w{}|v{|}y~}|t{|}y~}|t{|}y~}|t{|}y~}|t{|}y~}|g{|}y~}x|v{~|w{~|v{~|w{~|v{~|w{~|v{~|w{~|w{|~w{|~|v"
- "{}|o{}y~}r{|~|n{~|r{|y}r{|}~}|r{~{~|r{|y}X{|~|n{~|r{|y}q{~|~|s{~}n{~|r{|y~q{~|~}r{|y~|r{|}~}|s{|~|n{~|r{|~}r{|x"
- "~|r{~{~|Y{|}|n{}|r{|y}q{~{~|q{|}s{|}o{|}|~X{}x~}s{}x~}s{}x~}s{}x~}s{}x~}r{~|s{|~w{|~I{~d{|p{|}|r{|y{|p{|e{|w{}r"
- "{}|r{}xy|ty}| c{|~|{|}f{~|q{|~|~q{}|{~t{|~{}{}|xy}{|}y{~r{~{|~q{|~o{~p{~p{|}~}|={}|r{~}{|~s{|}~}r{~|{|~|t{~|{|~"
- "q{}~|s{}|py}{|~|p{}|t{~|{|~|u{|~|{|~2y}{|~|v{|~}|y{|~}t{~y}s{~|y{|~|u{|~|{|}~u{~|y{|y}u{}|p{}|q{|~}|{|~|u{~|w{~"
- "|t{~}ny}t{~|y{}~s{~|ry~|x{|y~vy~|x{}|w{|~}x|~}u{}|y{|y}v{|~y|{|~}u{}|x{|~|vy}|{|~|sy}r{~|w{~|v{~|x{|~x{|~xy~|yy"
- "}w{|~y{|~|uy}xy}q{|~|t{|~p{~|o{|}py~K{|}^{}|f{~|d{~m{|o{|r{|}m{~ p{~|\"{|}o{~|q{}|={~}{|~py}r{~y{|K{}~;{~|ay|h{"
- "|}{|~q{}~}s{~}p{}|q{|~|y{}~ry}sy}wy}v{~y{}|{|}v{|~|y{|~}g{}y~|d{}|;{}q{~|{|~|u{|y}~x}t{~|y{~q{~|r{|}{|~r{|{|t{}"
- "{|y}|{}t{|y}~M{}u{}g{|~{y}fy|{~ry|{~Xx~{}Xy~q{}|{}|g{}w{}t{~x{}|u{}{}x{}|f{~y}q{~y}q{~y}q{~y}q{~y}q{~y}sy}{~|s{"
- "|~|{|}~u{}|p{}|p{}|p{}|ny}py}py}p{~}r{~|y{|y}uy~|x{}|w{|~}x|~}v{|~}x|~}v{|~}x|~}v{|~}x|~}v{|~}x|~}i{|~}|{|~}u{~"
- "|w{~|v{~|w{~|v{~|w{~|v{~|w{~|vy}xy}u{}w~}t{~}yy}q{|oy|q{|{|d{|{|q{|}|V{|oy|q{|{|q{|{|q{|oy|q{|{y|r{|{y|ry|y}c{|"
- "oy|q{|{|d{|{|V{|o{|p{|{|q{|{|p{|r{|}n{|{|Y{~|{}{y}u{~}xy}u{~}xy}u{~}xy}u{~}xy}s{~|r{~|xy}W{}r{|x{}d{~q{|x~sy~|}"
- "~}r{|~p{|~}|u{|~w{~s{|y~r{~|yy}u{|} ay}b{~|p{}{}s{|u~u{|~{}uy}{|}{}|r{~{|~q{|}p{|}p{|}p{|~|<{~r{|~x{~|t{|}~}s{|"
- "~xy}u{|}x{~|s{|~}|s{~o{~l{|}s{~|{|~t{|}x{}|s{~}p{~}o{|~fy}o{~x{}|w{|~|{}~v}v{|~{~s{~|xy}u{~|w{}|v{~|w{~|v{}|p{}"
- "|q{~|w{|}u{~|w{~|t{~}ny}t{~|{}~r{~|r{~y}xy}~v{~|~x{}|w{~|w{|~u{}|x{|~v{~|w{|~|v{}|w{~|v{~|xy|sy}r{~|w{~|vy}x{}|"
- "w{~|{|~y}y{~|vy}{~|t{|~|{|~q{|~|s{|~p{|}o{|}qy}|}X{|x~|t{|y}y~|s{|y~}|s{|y~y}|t{|}y~|s{}y~|r{|y~y}|t{~|y~}q{~o{"
- "~r{|}yy}q{~s{~|y~|}y~|u{~|}~}s{|}y~|t{|y}y~|s{|y~y}|s{~|~|s{}y~}r{}y~|r{~x{}|uy}x{~u{}|y{~|y{~v{|~y{|}ty}x{~t{|"
- "w~}ry}o{~|qy}K{|}~}y{~t{~x{~|p{~ry}q{}y~}|s{~|}~}t{~|x{~|r{}|s{|}x{~|vy|w{}|uy|y{}~}u{}u~|v{~y{~|{y}u{|y~}r{}x~"
- "y}tw~}t{}|y{}|r{~|~|s{~}q{}|q{~|wy}u{}w~}uy}wy}v{~y{}|{|}v{~|w{|~u{|o{~|}|}|n{|s{}|c{|}c{~|p{}y~}t{|~xy|t{~|{|~"
- "|t{|}{y}q{~|ry}y{}i{}{|}y{~{}t{}|{~N{}{|x}|{}g{|~{y}r{}|o{}|p{~}e{~x{}|u{|x~{}W{~q{|}{~f{}x{}|t{~x{}s{}~x{}q{~|"
- "r{|~{~r{|~{~r{|~{~r{|~{~r{|~{~r{|~{~s{~y{~|s{~|w{}|v{}|p{}|p{}|p{}|ny}py}py}p{~}r{~|w{~|v{~|~x{}|w{~|w{|~v{~|w{"
- "|~v{~|w{|~v{~|w{|~v{~|w{|~i{~|x{|}~u{~|w{~|v{~|w{~|v{~|w{~|v{~|w{~|v{|~|{|~t{}|y{|y}u{~xy}s{|x~|s{|x~|s{|x~|s{|"
- "x~|s{|x~|s{|x~|v{|y~}|}y~}t{|}~}|s{|}y~|s{|}y~|s{|}y~|s{|}y~|r{~}p{~|p{~|p{~|q{|x~}s{~|}~}s{|}y~|s{|}y~|s{|}y~|"
- "s{|}y~|s{|}~}|f{|}~y}|t{~x{}|t{~x{}|t{~x{}|t{~x{}|uy}x{~t{|y}y~|ty}x{~[y}y{~y{}|wy}v{}|ww}{x}|wy}xx}|wy}v{}|t{~"
- "|ry}x{~|X{|}r{~|{y|ex~r{|x~t{|u~s{|y~}r{|}{|~|v{|~w{~sy}~ry}y{~|u{}| b{}y~x}e{~|c{~{|}s{}y~|u{}~}y{}qy}~|d{}|o{"
- "~p{}{}q{}|I{|}r{|~xy}ry}n{}|q{|~r{~|}|s{~}~}|t{|}|y}|p{~r{|x~|t{|~|{|~}sy|py|p{|~dy}m{|~v{~|{}|{|~|{~v{}|{}|t{~"
- "|x{~|v{|~o{~|wy}v{}|p{}|r{|~n{~|w{~|t{~}ny}t{~|}~q{~|r{~|~x{~|~v{~{y}y{}|x{|~u{}|v{}|xy}w{|~u{}|v{}|x{|~uy}|oy}"
- "r{~|w{~|v{|~x{~v{}|{|}|~y{~t{~y}r{|~{~|q{~}r{|~o{~o{|}q{~y{~X{~|{|~t{|~}{|~|t{~|{}~t{|~|{|~|t{~|{|~|s{~|q{~|{}~"
- "|t{~}{|~|r{~o{~r{|}{y}p{~s{~}{|~}{y}u{~}{|~|t{~|{|~t{|~}{|~|t{~|{|~|s{~}|s{|~|{y}r{~|q{~x{}|u{|~y{|}uy}{|~}{|}u"
- "y}{~s{|~y{|}p{~|ry}o{~|qy}X{}~}{|y~|w{|~|{|}|}t{~y{|~o{~r{|~}s{}|x{|s{~}{|~|uy}y{|~q{}~s{|}x{~|v{~v{|}v{|}y{|}{"
- "|}w{|}|}y{~t{~y{~|{y}v{|}yy}ty}yy}r{|}r{~x{|}s{|}{|}ry}r{}|q{~v{|~vy}{y}{y}vy}wy}v{~|{}|{y}w{|~u{}|w{|}o{|{}|{|"
- "n{}|t{}|cx}dy|qx}|~|t{~|q{|}x{|}sy}~p{~|r{|~}|h{}{}|wy|tx}|ry|{|\\{}{}|y{~{y|g{}y~q{}|q{|~|qy|{~e{~x{}|u{|x~{}W"
- "{~p{}~|r{|y{|s{}x{}s{~y{}s{}{}|{}p{|q{}|{}|s{}|{}|s{}|{}|s{}|{}|s{}|{}|s{}|{}|u{|}y{~|t{|~o{}|p{}|p{}|p{}|ny}py"
- "}py}p{~}r{~|wy}v{~{y}y{}|x{|~u{}|x{|~u{}|x{|~u{}|x{|~u{}|x{|~u{}|u{|y{|u{|~x{|}{}|v{~|w{~|v{~|w{~|v{~|w{~|v{~|w"
- "{~|u{|~{~|t{}|x{|~u{~{|y~r{~|{|~s{~|{|~s{~|{|~s{~|{|~s{~|{|~s{~|{|~v{~|{|~}yy}u{~|{}~s{~|{|~|t{~|{|~|t{~|{|~|t{"
- "~|{|~|s{~}p{~|p{~|p{~|q{~|{|~|t{~}{|~|t{~|{|~s{~|{|~s{~|{|~s{~|{|~s{~|{|~r{~|q{~|{|~s{~x{}|t{~x{}|t{~x{}|t{~x{}"
- "|u{|~y{|}t{|~}{|~|u{|~y{|}[x}y~w}wy}v~y}w{}|{}~}{|}w{}|yy}{|}w{}|{|~y{|}t{~|r{|~y{|~Zv~}r{}{}|fv~u{|u~}uv~}sw~}"
- "s{~w{~v{|~w{~s{~|}|s{|~{|~tr~| i{~|b{~|d{|}{}|r{|y~}r{}y|y~|u{}~}{|e{~|o{~|d{}|I{}|r{|}xy}ry}oy}qy~|s{}|{}|t{|~"
- "|{|~|u{|~}{|~|ry}r{~|{|~|t{}y~x}Z{}~qv~}r{}~o{|~|w{|~{|~x{~y{~|w{~y{|}tv~}u{|~o{~|wy}v{}v~}u{}v~v{|}x{}x~|vt~|t"
- "{~}ny}ty~}~|r{~|r{~{}|{|}|~v{~y{~|{}|x{|}uy}v{}v~|w{|}uy}v{}v~|t{|}~}|ry}r{~|w{~|u{~|{|}vy}{}|{~{|~t{}~|q{}~}qy"
- "}q{|~o{}|p{|}r{|}y{}|V{|~t{|~xy}u{|}x{|ty}x{}|u{|}x{}|s{~|r{|}x{~|t{~x{}|r{~o{~r{|~}~o{~s{~x{~y{|~u{~x{}|u{|}xy"
- "}u{|~xy}uy}x{}|s{~q{|~|o{~|q{~x{}|t{~y{}|u{|~{y}~{}|ty~|r{~|{~|qy}qy}o{~|qy}r{}~}y|}h{|}{y}~y|}w{~|x{}~|t{~{}~|"
- "sw}~sy}|}~t{}|o{~x{}|t{~yy}r{|y~|t{|}x{~|v{~yy|{|~v{~|y{}|y{~w{|{|}y{~t{~y{~|{y}v{~|x{~|u{~|y{|~r{|}rv~}s{~|y{~"
- "|r{~|s{}|q{~|w{|~v{~yy}{|~vy}wy}v{|}{}y|~v{|}|w~x}w{~l{}|k{~t{}|r{|}x{|}r{}c{|q{|~{|{y|u{|y~y}s{}|x{|}ty}~y}|r{"
- "~r{|}{|~|i{}{}|y{|{y|u{|x}r{|~{y}tv~}i{}{}~}~|{y|\\v~}s{}y~}r{|x}e{~x{}|tx~{}W{~q{|x~r{}~{~|t{}y{}y{}|v{}{y|{y}"
- "|w{|y}{y|{}r{|q{~y{|}s{~y{|}s{~y{|}s{~y{|}s{~y{|}s{~y{|}u{~|yv~}x{|~o{}v~}u{}v~}u{}v~}u{}v~}sy}py}py}p{~}s{}x~}"
- "yy}v{~y{~|{}|x{|}uy}x{|}uy}x{|}uy}x{|}uy}x{|}uy}v{|~|y}u{|}y{|}yy}v{~|w{~|v{~|w{~|v{~|w{~|v{~|w{~|t{}~}s{}|xy}u"
- "{~y{|}~s{|y{|~p{|~p{|~p{|~p{|~p{|~s{|~x{|}v{|}x{}t{|}x{}|u{|}x{}|u{|}x{}|u{|}x{}|s{~}p{~|p{~|p{~|r{|}xy}t{~x{}|"
- "u{|}xy}u{|}xy}u{|}xy}u{|}xy}u{|}x{}|h{|}yy}|t{~x{}|t{~x{}|t{~x{}|t{~x{}|t{~|{~|t{|~xy}t{~|{~|[{}x|~x|}w{}t|}w{}"
- "|{}~}{|}w{}|{y}y{|}w{}|y{}y{|}t{~|q{}|{y}X{}|p{}{}f{}v~|v{}t~u{|w~s{|v~s{~w{~u{~w{~t{|~{|}r{~{y}t{}| b{}~x}|e{~"
- "|e{}v~}r{}{y}t{|}{~y|~v{~|{~}~|f{~n{~|d{}|d{|y~}d{~q{|~xy}ry}q{}~|o{|~|u{|}y{}|oy}u{|~xy}r{~r{|}xy}p{}|[{}~`{}~"
- "p{~|vy}{y}y{|}y{~w{|v~|u{~|y{|y}v{|~vy|v{~|wy}v{}|p{}|r{|~u{~|v{~|w{~|t{~}ny}t{~}{|~r{~|r{~{|}{}y|~v{~y{|~{}|x{"
- "|~u{}|v{}|r{|~u{}|v{}|x{}~q{|y}sy}r{~|w{~|uy}{}|v{|~{~y{}|y}u{|~}~q{|~q{}~p{|~o{|}p{|}J{|x}~t{|}x{|}uy}py}x{}|u"
- "{|v~}s{~|ry}x{}|t{~x{}|r{~o{~r{|~}~|p{~s{~x{~y{|~u{~x{}|uy}xy}u{|}x{|}uy}x{}|s{~p{|}~}|r{~|q{~x{}|t{}|{~s{~|~{~"
- "{~|t{}~qy}{~qy}q{|~|o{~|q{|~|s{}{|y~|h{}|y{~|y{~w{~w{|~s{~y{|~|u{|}x{~t{|}xy}u{|x~|r{~x{}|t{}|{~q{~|y}t{|}x{~|v"
- "{~yy}y{~v{~x{~x{~|v{|}y{~t{~y{~|{y}v{~w{}|u{~w{~r{|}r{~xy}t{|}xy}sy}r{}|qy}wy}vy}{y}{y}vy}wy}u{|w~|v{|~u{}|x{}r"
- "~|u{}|t{|r~}u{}|r{~v}~|s{}c{}|r{|~{|p{~q{|}x{|}r{~|f{|}y{|~|j{}{|}y{~{}g{~|{~o{|}i{}{}|y{}{}Y{}|J{~x{~|t{|y~{}r"
- "{~|I{}|{~r{|}{|~|t{}{y|{~s{}{}~r{~r{|v~|u{|v~|u{|v~|u{|v~|u{|v~|u{|v~|w{|v~|t{|~u{|v{}|p{}|p{}|p{}|ny}py}py}p{~"
- "}r{~|wy}v{~y{|~{}|x{|~u{}|x{|~u{}|x{|~u{}|x{|~u{}|x{|~u{}|u{|~}t{|~{|}x{}|v{~|w{~|v{~|w{~|v{~|w{~|v{~|w{~|t{|~r"
- "{}v~|u{~w{~|t{|x}~s{|x}~s{|x}~s{|x}~s{|x}~s{|x}~vy}~}u~vy}p{|v~}u{|v~}u{|v~}u{|v~}s{~}p{~|p{~|p{~|ry}xy}t{~x{}|"
- "uy}xy}uy}xy}uy}xy}uy}xy}uy}xy}uv~}ty}{}{y}t{~x{}|t{~x{}|t{~x{}|t{~x{}|ty}{~s{|}x{|}ty}{~Zy}y{~y{}|wy}v{}|ww}{x}"
- "|ww}x{}|wy}v{}|t{~|q{|}{~Yy}~x}r{|y}f{|y~}y~|v{|y~y}y~}t{}y~|r{}x~|s{~w{~u{~x{|~ty}y{~r{}|~|t{|} ay}b{}|d{}|{~s"
- "y}{}{|}t{}{|}y{~w{|~xy~e{~n{~|fv~}L{|}q{|~x{~|ry}ry}qy|xy}u{}v~}uy|xy}u{|~xy}s{|}r{|}xy}t{}x{~|[{|~|qv~}q{~|p{}"
- "u{|}{|~{|~|{y}w{~|xy}u{~|x{|~u{~|wy}v{~|w{~|v{}|p{}|q{~|w{|~|v{~|w{~|t{~}ry}yy}t{~|yy}s{~|r{~y{~{~{|~v{~xx}|w{~"
- "|w{|~|v{}|q{~|x{}|~|v{}|w{~|w{|~w{|~sy}r{~|w{~|t{~|~t{~y}y{|y}|u{~|{y}r{|~r{|~o{|~n{~p{|}K{|~x{~t{|~xy}u{|}x{|t"
- "y}x{}|u{|}n{~|r{|}x{~|t{~x{}|r{~o{~r{|~{|~p{~s{~x{~y{|~u{~x{}|u{|}xy}u{|~xy}uy}x{}|s{~m{}~r{~|q{~x{~|t{|}|}sy}~"
- "{y}~s{~y}r{|~y}r{|~p{|~|o{~|p{~|Zy|{}~}{|}w{~|x{}~|t{~xy}u{}|y{|}ty}xy}u{~|o{~x{}|t{|}|}ry}y{~t{|~x{~|v{~yy}{|}"
- "v{~|y{~x{~u{|}y{~t{~y{~|{}|v{~w{~|u{~|y{|~r{|}r{~|y{}|t{~|w{~t{~}q{}|py}{|~}t{}w~}uy}wy}sy}s{~|w{|~|w{~l{}|k{~t"
- "{}|q{}xy|r{}c{~|r{|~{|{y|s{~p{~|{|~|ty}~y}|g{~}yy}i{}{|y}|{}g{|~|}~p{|}hy}|y{~|}Y{}|J{~x{~|r{}{}r{|Iy}{~|r{}{|y"
- "}|u{}|x{}|t{}y|y}sy}r{~|xy}u{~|xy}u{~|xy}u{~|xy}u{~|xy}u{~|xy}w{}|x{~|s{~|wy}v{}|p{}|p{}|p{}|ny}py}py}p{~}r{~|w"
- "{~|v{~xx}|w{~|w{|~|w{~|w{|~|w{~|w{|~|w{~|w{|~|w{~|w{|~|uy}~|t{~}|x{|~|v{~|w{~|v{~|w{~|v{~|w{~|v{~|w{~|t{|~r{}|p"
- "{~w{~|u{|~x{~t{|~x{~t{|~x{~t{|~x{~t{|~x{~t{|~x{~w{|~|y{~qy}p{|}p{|}p{|}p{|}n{~}p{~|p{~|p{~|r{|}x{}|t{~x{}|u{|}x"
- "y}u{|}xy}u{|}xy}u{|}xy}u{|}x{}|h{|y}y{}|t{~x{~|t{~x{~|t{~x{~|t{~x{~|t{|~y}s{|~xy}t{|~y}Y{~|{}{y}u{~}x{}~u{~}x{}"
- "~u{~}x{}~u{~}xy}s{~|p{~y}X{}|n{~}e{|{}{|tx|}{|r{~}p{}~|r{~w{~uy}y{}|t{~|y{~|s{|y~ry}| c{|~|{y|f{}|d{}|{~s{|~{}{"
- "}|u{|}y{~y|~v{~|{|y~|f{~|o{~|d{}|py|cy|q{~|p{~}{|~qy}s{|~p{|~|{|~|q{}|t{|~|{|~|t{~|{|~|s{}|q{~|{|~|t{~}{}~ry|py"
- "|p{~}d{|~|o{|u{|~y{}~}|~}|w{|~w{|~u{~|y{|}~u{|~|y{}~u{~|y{|y}u{}|p{}|q{|~y|{|}~|v{~|w{~|t{~}r{}~y|~|t{~|x{~|t{~"
- "|r{~yx}{|~v{~wy~|w{|~|y{|~}u{}|q{|~|{|y~}u{}|w{~|v{~}|{|y}sy}r{|~|{|}~s{}~}t{}~|xy~uy}x{~|s{|~s{|~|o{|~n{}|q{|}"
- "K{|~y{}~|u{|~}{|~|t{~|{}~t{|~|{|~|t{~|{|~|s{~|q{~|{|~|t{~x{}|r{~o{~r{|}yy}q{~s{~x{~y{|~u{~x{}|t{~|{|~t{|~}{|~|u"
- "{|~|{|~|s{~q{|~|{}~r{~|q{~|{|~|sy~|s{|~}{|~}t{}|{~|ry~|s{|~|oy}o{~|qy}Xx~{}y~|w{|}|{|x}t{~|{|~|uy}y{}|t{|~|{|~|"
- "u{~|x{|s{~x{}|sy~|s{|~x{}|u{|~|{|~|v{}|{y~{y}v{|~|{~{|~|u{|}y{~t{~|{~y|~|v{~}yy}ty}yy}q{~r{|}{|~t{|~vy}v{~}p{}|"
- "o{~y|~qy}sy}wy}s{}|s{|~|y{|~}v{|}m{}|l{}|t{}|c{|}|d{~|q{~y}|~|t{}|q{|y}~}|}r{~|p{~p{}~|}|i{|}x{|}b{|[{|}x{|}X{|"
- "I{~|{|~|r{}{}?{|y{|r{}|{y}~}v{|}y{|}s{|}{y}~}u{|~r{|~w{|~v{|~w{|~v{|~w{|~v{|~w{|~v{|~w{|~v{|~w{|~x{|~w{~|s{}~|y"
- "{|~|v{}|p{}|p{}|p{}|ny}py}py}p{~}r{~|y{|y}u{~wy~|w{|~|y{|~}v{|~|y{|~}v{|~|y{|~}v{|~|y{|~}v{|~|y{|~}u{|}{|}t{}~|"
- "y{|~}u{|~|{|}~u{|~|{|}~u{|~|{|}~u{|~|{|}~s{|~r{}|p{~x{}~t{|~y{}~|u{|~y{}~|u{|~y{}~|u{|~y{}~|u{|~y{}~|u{|~y{}~|x"
- "{|}{|}~}yy}v{|~x{~s{~|{|~|t{~|{|~|t{~|{|~|t{~|{|~|s{~}p{~|p{~|p{~|q{~|{|~s{~x{}|t{~|{|~s{~|{|~s{~|{|~s{~|{|~s{~"
- "|{|~r{|p{~}{|~s{~|{|~|t{~|{|~|t{~|{|~|t{~|{|~|sy~|s{|~}{|~|sy~|X{}x~}s{}x~}s{}x~}s{}x~}s{}x~}r{~|p{}~|Y{|}m{|}e"
- "{|}~}|s{|y~}|r{|n{}q{~w{~t{}y~}t{|~xy}s{|~}q{|u~| h{|x~|f{~|d{~{|}r{}x~}t{~x{|y~|v{|y~}y|~f{}|o{~c{}|p{~}c{~}q{"
- "~n{}~}|qy}s{|v~}t{|x~|p{}|s{|y~}|r{}y~|r{~p{|}y~|s{|y~}q{~}p{~}o{~}f{|~|n{~|uy}oy}v{~|vv~}|t{|}y~}|uv~}t{}u~u{}"
- "|p{|}y~}{}|v{~|w{~|t{~}q{}y~}s{~|x{|~|uu~v{~y{|~|{|~v{~w{|~|v{|}y~}|t{}|p{|}y~y}~|v{}|wy}u{}x~}ry}q{|x~}r{|~|t{"
- "|~|xy}v{|~w{|~s{|~s{}u~}t{|~n{|}q{|}J{}y~|}~u{|y}y~|s{|y~}|s{|y~y}|t{|}y~|r{~|q{|y~y}|t{~x{}|r{~o{~r{|}x{~|r{~s"
- "{~x{~y{|~u{~x{}|t{|x~|t{|y}y~|s{|y~y}|s{~p{}y~}|r{}~|r{|y~|}|s{}~q{~|y{~|u{|}y{|~r{}~r{}v~ry}o{~|qy}K{|y~}y{~t{"
- "~}y~}sx}|r{|}y~|s{}y~y}s{~x{}|s{}~r{}|x{|~u{|~}~}~|u{}~y|~}t{|}x~}|t{|}y{~s{}x~}|u{~}y~}r{}y~}p{|}r{}~}|t{}s~w{"
- "}u~|u{}|r{}x~y|x~|ty}sy}wy}s{}|r{|}y~}|t{|m{}|l{|v{|}{}y|}e{}~|d{~|p{}y~}t{|v~|e{~|p{~|p{|~|fx}|>x}|Yv~}L{~}~y}"
- "~r{}{}3{|}w{}|v{~x{|~y}u{}w{}t{~|ry}v{~|wy}v{~|wy}v{~|wy}v{~|wy}v{~|wy}v{~|yy}wu~|w{|}y~}|u{}u~u{}u~u{}u~u{}u~s"
- "y}py}py}p{~}rv~}t{~w{|~|v{|}y~}|t{|}y~}|t{|}y~}|t{|}y~}|t{|}y~}|ix|}y~}|s{|x~}s{|x~}s{|x~}s{|x~}r{|~r{}|p{~{}~}"
- "|s{}y~|}~t{}y~|}~t{}y~|}~t{}y~|}~t{}y~|}~t{}y~|}~w{}~}|{}y~}tx}~}s{|}y~|s{|}y~|s{|}y~|s{|}y~|r{~}p{~|p{~|p{~|q{"
- "|}y~|s{~x{}|t{|x~|s{|x~|s{|x~|s{|x~|s{|}~}|r{}|r{|y}~}|s{|y~|}|t{|y~|}|t{|y~|}|t{|y~|}|s{}~r{|y}y~|r{}~ p{~|o{|"
- "G{| V{}I{|}p{|}Vy| py|n{}f{|c{}~|yy| T{| Z{|~b{|} W{|x{}|X{~1{|}k{}| sy}cy}o{~|qy}={~D{}|s{|}e{|}`{~b{~|s{~"
- " ,{}|e{|w~c{|c{~|o{|H{~|r{}y{|} %{~m{}{}e{|~K{|o{|oy|p{|~x{~| r{} I{|~| qy}r{|}ny} q{|~ n{|H{~p{~U{| o"
- "{|={|}x~} 2{|~b{|}f{|t~} v{|~|{|~X{|~1{|}k{}| t{|~|c{|}o{~|q{}|={~D{}|s{|}e{|}`{~b{~|s{~ ,{|c{|~}I{~|;{~|ry}{"
- "y} %{~m{}{}e{|y~${~|{|~ qy} I{}| r{|~|r{|}o{|~| ry}| :{|}r{|} p{|y~|e{}~} W{|y~}|Y{|~}1{|}k{}| u{"
- "|~|a{~}p{~|r{}~<{~D{|r{|}e{|}`{~b{~|s{~ 9{~|;{~|r{|}~} ${~m{}{}f{|}~|${|}~}| r{|y} J{|y} s{|~|q{|}p{|~|t{"
- };
-
// Define a 25x33 font (normal arial).
static const char *const data_font25x33[] = {
" "
@@ -60341,47 +60225,43 @@ namespace cimg_library_suffixed {
static const CImgList<ucharT>& font(const unsigned int requested_height, const bool is_variable_width=true) {
if (!requested_height) return CImgList<ucharT>::const_empty();
cimg::mutex(11);
-
static const unsigned char font_resizemap[] = {
- 0, 16, 23, 28, 32, 36, 39, 42, 45, 48, 50, 53, 55, 58, 60, 62,
- 64, 66, 68, 70, 71, 73, 75, 77, 78, 80, 81, 83, 84, 86, 87, 89,
- 90, 92, 93, 94, 96, 97, 98, 100, 101, 102, 103, 105, 106, 107, 108, 109,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 145, 146, 147, 148, 149, 150, 151, 151, 152, 153, 154, 155, 156,
- 156, 157, 158, 159, 160, 160, 161, 162, 163, 164, 164, 165, 166, 167, 167, 168,
- 169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 179, 179, 180,
- 181, 181, 182, 183, 183, 184, 185, 186, 186, 187, 188, 188, 189, 190, 190, 191,
- 192, 192, 193, 194, 194, 195, 196, 196, 197, 198, 198, 199, 199, 200, 201, 201,
- 202, 203, 203, 204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211,
- 212, 212, 213, 214, 214, 215, 215, 216, 217, 217, 218, 218, 219, 220, 220, 221,
- 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 228, 228, 229, 229, 230,
- 230, 231, 231, 232, 233, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
- 239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247,
- 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255 };
+ 0, 4, 7, 9, 11, 13, 15, 17, 19, 21, 22, 24, 26, 27, 29, 30,
+ 32, 33, 35, 36, 38, 39, 41, 42, 43, 45, 46, 47, 49, 50, 51, 52,
+ 54, 55, 56, 58, 59, 60, 61, 62, 64, 65, 66, 67, 68, 69, 71, 72,
+ 73, 74, 75, 76, 77, 78, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 157, 158, 159, 160, 161, 162, 163, 164, 164, 165,
+ 166, 167, 168, 169, 170, 170, 171, 172, 173, 174, 175, 176, 176, 177, 178, 179,
+ 180, 181, 181, 182, 183, 184, 185, 186, 186, 187, 188, 189, 190, 191, 191, 192,
+ 193, 194, 195, 196, 196, 197, 198, 199, 200, 200, 201, 202, 203, 204, 205, 205,
+ 206, 207, 208, 209, 209, 210, 211, 212, 213, 213, 214, 215, 216, 216, 217, 218,
+ 219, 220, 220, 221, 222, 223, 224, 224, 225, 226, 227, 227, 228, 229, 230, 231,
+ 231, 232, 233, 234, 234, 235, 236, 237, 238, 238, 239, 240, 241, 241, 242, 243,
+ 244, 244, 245, 246, 247, 247, 248, 249, 250, 250, 251, 252, 253, 253, 254, 255 };
static const char *const *font_data[] = {
cimg::data_font10x13,
- cimg::data_font13x16,
cimg::data_font25x33,
cimg::data_font53x64,
cimg::data_font102x128 };
static const unsigned int
- font_width[] = { 10,13,25,53,102 },
- font_height[] = { 13,16,33,64,128 },
- font_M[] = { 86,91,91,91,47 },
+ font_width[] = { 10,25,53,102 },
+ font_height[] = { 13,33,64,128 },
+ font_M[] = { 86,91,91,47 },
font_chunk[] = { sizeof(cimg::data_font10x13)/sizeof(char*),
- sizeof(cimg::data_font13x16)/sizeof(char*),
sizeof(cimg::data_font25x33)/sizeof(char*),
sizeof(cimg::data_font53x64)/sizeof(char*),
sizeof(cimg::data_font102x128)/sizeof(char*) };
- static const unsigned char font_is_binary[] = { 1,0,0,0,1 };
- static CImg<ucharT> font_base[5];
+ static const unsigned char font_is_binary[] = { 1,0,0,1 };
+ static CImg<ucharT> font_base[4];
unsigned int ind =
requested_height<=font_height[0]?0U:
requested_height<=font_height[1]?1U:
- requested_height<=font_height[2]?2U:
- requested_height<=font_height[3]?3U:4U;
+ requested_height<=font_height[2]?2U:3U;
// Decompress nearest base font data if needed.
CImg<ucharT> &basef = font_base[ind];