Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at 2018-05-17 18:03:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetype2 (Old) and /work/SRC/openSUSE:Factory/.freetype2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetype2" Thu May 17 18:03:38 2018 rev:83 rq:606991 version:2.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/freetype2/freetype2.changes 2018-03-12 12:02:21.047605644 +0100 +++ /work/SRC/openSUSE:Factory/.freetype2.new/freetype2.changes 2018-05-17 18:03:41.275677970 +0200 @@ -1,0 +2,27 @@ +Mon May 14 10:06:56 UTC 2018 - [email protected] + +- Re-enable freetype-config, there is just too many fallouts. + +------------------------------------------------------------------- +Wed May 2 10:54:32 UTC 2018 - [email protected] + +- Update to version 2.9.1 + * Type 1 fonts containing flex features were not rendered + correctly (bug introduced in version 2.9). + * CVE-2018-6942: Older FreeType versions can crash with certain + malformed variation fonts. + * Bug fix: Multiple calls to `FT_Get_MM_Var' returned garbage. + * Emboldening of bitmaps didn't work correctly sometimes, showing + various artifacts (bug introduced in version 2.8.1). + * The auto-hinter script ranges have been updated for Unicode 11. + No support for new scripts have been added, however, with the + exception of Georgian Mtavruli. +- freetype-config is now deprecated by upstream and not enabled + by default. +- Drop upstreamed patches: + * bnc1079600.patch + * psaux-flex.patch + * 0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch + * 0001-truetype-Better-protection-against-invalid-VF-data.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/freetype2/ft2demos.changes 2018-03-22 11:59:01.730772041 +0100 +++ /work/SRC/openSUSE:Factory/.freetype2.new/ft2demos.changes 2018-05-17 18:03:41.327676068 +0200 @@ -1,0 +2,6 @@ +Wed May 2 10:56:39 UTC 2018 - [email protected] + +- Update to version 2.9.1 + * No changelog upstream. + +------------------------------------------------------------------- Old: ---- 0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch 0001-truetype-Better-protection-against-invalid-VF-data.patch bnc1079600.patch freetype-2.9.tar.bz2 freetype-doc-2.9.tar.bz2 ft2demos-2.9.tar.bz2 psaux-flex.patch New: ---- freetype-2.9.1.tar.bz2 freetype-doc-2.9.1.tar.bz2 ft2demos-2.9.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.ZQasoc/_old 2018-05-17 18:03:42.619628817 +0200 +++ /var/tmp/diff_new_pack.ZQasoc/_new 2018-05-17 18:03:42.623628671 +0200 @@ -16,9 +16,9 @@ # -%define doc_version 2.9 +%define doc_version 2.9.1 Name: freetype2 -Version: 2.9 +Version: 2.9.1 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype OR GPL-2.0-or-later @@ -31,12 +31,7 @@ Patch0: bugzilla-308961-cmex-workaround.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc Patch1: don-t-mark-libpng-as-required-library.patch -# PATCH-FIX-UPSTREAM psaux-flex.patch -- Upstream commit cc2f3cdecff5a351e7e8961b9f2e389ab740231a -Patch2: psaux-flex.patch -Patch3: 0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch -Patch4: 0001-truetype-Better-protection-against-invalid-VF-data.patch -Patch5: enable-long-family-names-by-default.patch -Patch6: bnc1079600.patch +Patch2: enable-long-family-names-by-default.patch BuildRequires: gawk BuildRequires: libbz2-devel BuildRequires: libpng-devel @@ -102,10 +97,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" @@ -113,6 +104,7 @@ --with-bzip2 \ --with-png \ --with-zlib \ + --enable-freetype-config \ --disable-static make %{?_smp_mflags} @@ -123,6 +115,8 @@ # remove documentation that does not belong in an rpm rm docs/INSTALL* +rm %{buildroot}%{_libdir}/libfreetype.la + %post -n libfreetype6 -p /sbin/ldconfig %postun -n libfreetype6 -p /sbin/ldconfig @@ -136,16 +130,11 @@ %files devel %doc docs/reference/* +%{_bindir}/freetype-config %{_includedir}/* -%if 0%{?suse_version} >= 1140 -%exclude %{_libdir}/libfreetype.*a -%else -%{_libdir}/libfreetype.*a -%endif %{_libdir}/libfreetype.so %{_libdir}/pkgconfig/freetype2.pc -%{_bindir}/* +%{_mandir}/man1/freetype-config.1%{ext_man} %{_datadir}/aclocal -%{_mandir}/man1/freetype-config* %changelog ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.ZQasoc/_old 2018-05-17 18:03:42.651627646 +0200 +++ /var/tmp/diff_new_pack.ZQasoc/_new 2018-05-17 18:03:42.655627500 +0200 @@ -16,16 +16,16 @@ # -%define freetype_version 2.9 +%define freetype_version 2.9.1 Name: ft2demos -Version: 2.9 +Version: 2.9.1 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0-or-later Group: Productivity/Publishing/Other Url: https://www.freetype.org -Source0: https://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2 -Source1: https://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 +Source0: https://download.savannah.nongnu.org/releases/freetype/freetype-%{freetype_version}.tar.bz2 +Source1: https://download.savannah.nongnu.org/releases/freetype/ft2demos-%{version}.tar.bz2 Source1000: bnc628213_test.otf Source1004: bnc629447_sigsegv31.ttf Source1013: bnc633938_badbdf.0 ++++++ freetype-2.9.tar.bz2 -> freetype-2.9.1.tar.bz2 ++++++ ++++ 43891 lines of diff (skipped) ++++++ freetype-doc-2.9.tar.bz2 -> freetype-doc-2.9.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/README.freetype-doc new/freetype-2.9.1/README.freetype-doc --- old/freetype-2.9/README.freetype-doc 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/README.freetype-doc 2018-05-02 10:38:22.000000000 +0200 @@ -7,10 +7,10 @@ mkdir src cd src - tar xzvf freetype-2.9.tar.gz - tar xzvf freetype-doc-2.9.tar.gz + tar xzvf freetype-2.9.1.tar.gz + tar xzvf freetype-doc-2.9.1.tar.gz -Now you can move the `docs' subdirectory of `freetype-2.9' to any place +Now you can move the `docs' subdirectory of `freetype-2.9.1' to any place you want. The entry point for the documentation is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/design-1.html new/freetype-2.9.1/docs/design/design-1.html --- old/freetype-2.9/docs/design/design-1.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/design-1.html 2018-05-02 10:38:22.000000000 +0200 @@ -141,7 +141,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -160,22 +160,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/design-2.html new/freetype-2.9.1/docs/design/design-2.html --- old/freetype-2.9/docs/design/design-2.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/design-2.html 2018-05-02 10:38:22.000000000 +0200 @@ -196,7 +196,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -215,22 +215,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/design-3.html new/freetype-2.9.1/docs/design/design-3.html --- old/freetype-2.9/docs/design/design-3.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/design-3.html 2018-05-02 10:38:22.000000000 +0200 @@ -348,7 +348,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -367,22 +367,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/design-4.html new/freetype-2.9.1/docs/design/design-4.html --- old/freetype-2.9/docs/design/design-4.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/design-4.html 2018-05-02 10:38:22.000000000 +0200 @@ -310,7 +310,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -329,22 +329,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/design-5.html new/freetype-2.9.1/docs/design/design-5.html --- old/freetype-2.9/docs/design/design-5.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/design-5.html 2018-05-02 10:38:22.000000000 +0200 @@ -452,7 +452,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -471,22 +471,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/design-6.html new/freetype-2.9.1/docs/design/design-6.html --- old/freetype-2.9/docs/design/design-6.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/design-6.html 2018-05-02 10:38:22.000000000 +0200 @@ -318,7 +318,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-Sep-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -337,22 +337,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/design/index.html new/freetype-2.9.1/docs/design/index.html --- old/freetype-2.9/docs/design/index.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/design/index.html 2018-05-02 10:38:22.000000000 +0200 @@ -143,7 +143,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 13-Sep-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -162,22 +162,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/documentation.html new/freetype-2.9.1/docs/documentation.html --- old/freetype-2.9/docs/documentation.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/documentation.html 2018-05-02 10:38:22.000000000 +0200 @@ -108,7 +108,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 8-Sep-2016</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -127,22 +127,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-1.html new/freetype-2.9.1/docs/glyphs/glyphs-1.html --- old/freetype-2.9/docs/glyphs/glyphs-1.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-1.html 2018-05-02 10:38:22.000000000 +0200 @@ -176,7 +176,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -195,22 +195,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-2.html new/freetype-2.9.1/docs/glyphs/glyphs-2.html --- old/freetype-2.9/docs/glyphs/glyphs-2.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-2.html 2018-05-02 10:38:22.000000000 +0200 @@ -384,7 +384,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -403,22 +403,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-3.html new/freetype-2.9.1/docs/glyphs/glyphs-3.html --- old/freetype-2.9/docs/glyphs/glyphs-3.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-3.html 2018-05-02 10:38:22.000000000 +0200 @@ -433,7 +433,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -452,22 +452,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-4.html new/freetype-2.9.1/docs/glyphs/glyphs-4.html --- old/freetype-2.9/docs/glyphs/glyphs-4.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-4.html 2018-05-02 10:38:22.000000000 +0200 @@ -188,7 +188,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -207,22 +207,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-5.html new/freetype-2.9.1/docs/glyphs/glyphs-5.html --- old/freetype-2.9/docs/glyphs/glyphs-5.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-5.html 2018-05-02 10:38:22.000000000 +0200 @@ -356,7 +356,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -375,22 +375,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-6.html new/freetype-2.9.1/docs/glyphs/glyphs-6.html --- old/freetype-2.9/docs/glyphs/glyphs-6.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-6.html 2018-05-02 10:38:22.000000000 +0200 @@ -440,7 +440,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -459,22 +459,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/glyphs-7.html new/freetype-2.9.1/docs/glyphs/glyphs-7.html --- old/freetype-2.9/docs/glyphs/glyphs-7.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/glyphs-7.html 2018-05-02 10:38:22.000000000 +0200 @@ -338,7 +338,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 02-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -357,22 +357,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/glyphs/index.html new/freetype-2.9.1/docs/glyphs/index.html --- old/freetype-2.9/docs/glyphs/index.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/glyphs/index.html 2018-05-02 10:38:22.000000000 +0200 @@ -193,7 +193,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 07-Dec-2014</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -212,22 +212,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/index.html new/freetype-2.9.1/docs/index.html --- old/freetype-2.9/docs/index.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/index.html 2018-05-02 10:38:22.000000000 +0200 @@ -246,7 +246,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 7-Dec-2014</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -265,22 +265,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/subpixel-hinting.html new/freetype-2.9.1/docs/subpixel-hinting.html --- old/freetype-2.9/docs/subpixel-hinting.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/subpixel-hinting.html 2018-05-02 10:38:22.000000000 +0200 @@ -234,7 +234,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 8-Sep-2016</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -253,22 +253,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/text-rendering-general.html new/freetype-2.9.1/docs/text-rendering-general.html --- old/freetype-2.9/docs/text-rendering-general.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/text-rendering-general.html 2018-05-02 10:38:22.000000000 +0200 @@ -428,7 +428,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 12-Feb-2016</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -447,22 +447,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/tutorial/example1.c new/freetype-2.9.1/docs/tutorial/example1.c --- old/freetype-2.9/docs/tutorial/example1.c 2018-01-08 12:33:37.000000000 +0100 +++ new/freetype-2.9.1/docs/tutorial/example1.c 2018-05-02 10:38:22.000000000 +0200 @@ -32,6 +32,9 @@ FT_Int y_max = y + bitmap->rows; + /* for simplicity, we assume that `bitmap->pixel_mode' */ + /* is `FT_PIXEL_MODE_GRAY' (i.e., not a bitmap font) */ + for ( i = x, p = 0; i < x_max; i++, p++ ) { for ( j = y, q = 0; j < y_max; j++, q++ ) @@ -106,6 +109,9 @@ 100, 0 ); /* set character size */ /* error handling omitted */ + /* cmap selection omitted; */ + /* for simplicity we assume that the font contains a Unicode cmap */ + slot = face->glyph; /* set up matrix */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/tutorial/index.html new/freetype-2.9.1/docs/tutorial/index.html --- old/freetype-2.9/docs/tutorial/index.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/tutorial/index.html 2018-05-02 10:38:22.000000000 +0200 @@ -131,7 +131,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 7-Dec-2014</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -150,22 +150,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/tutorial/step1.html new/freetype-2.9.1/docs/tutorial/step1.html --- old/freetype-2.9/docs/tutorial/step1.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/tutorial/step1.html 2018-05-02 10:38:22.000000000 +0200 @@ -1005,7 +1005,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 2-May-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -1024,22 +1024,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/tutorial/step2.html new/freetype-2.9.1/docs/tutorial/step2.html --- old/freetype-2.9/docs/tutorial/step2.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/tutorial/step2.html 2018-05-02 10:38:22.000000000 +0200 @@ -1523,7 +1523,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 16-Sep-2017</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -1542,22 +1542,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.9/docs/tutorial/step3.html new/freetype-2.9.1/docs/tutorial/step3.html --- old/freetype-2.9/docs/tutorial/step3.html 2018-01-08 12:33:38.000000000 +0100 +++ new/freetype-2.9.1/docs/tutorial/step3.html 2018-05-02 10:38:22.000000000 +0200 @@ -102,7 +102,7 @@ <!-- ************************************************** --> <div class="updated"> - <p>Last update: 8-Sep-2016</p> + <p>Last update: 13-Feb-2018</p> </div> </div> </div> @@ -121,22 +121,25 @@ <div id="TOC"> <ul> <li class="funding"> - <p><a href="https://pledgie.com/campaigns/24434";> - <img alt="Click here to lend your support to the FreeType project and make a donation at pledgie.com!" - src="https://pledgie.com/campaigns/24434.png?skin_name=chrome"; + <form action="https://www.paypal.com/cgi-bin/webscr"; + method="post" + target="_top"> + <input type="hidden" + name="cmd" + value="_s-xclick"> + <input type="hidden" + name="hosted_button_id" + value="SK827YKEALMT4"> + <input type="image" + src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"; + name="submit" + alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" - align="middle"> - </a></p> - - <p><a href="https://flattr.com/submit/auto?fid=mq2xxp&url=https%3A%2F%2Fwww.freetype.org"; - target="_blank"> - <img class="with-border" - src="https://button.flattr.com/flattr-badge-large.png"; - alt="Flattr this" - title="Flattr this" - border="0" - align="middle"> - </a></p> + src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"; + width="1" + height="1"> + </form> </li> <li class="primary"> <a href="http://freetype.org/index.html";>Home</a> ++++++ ft2demos-2.9.tar.bz2 -> ft2demos-2.9.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/ChangeLog new/ft2demos-2.9.1/ChangeLog --- old/ft2demos-2.9/ChangeLog 2018-01-08 12:28:44.000000000 +0100 +++ new/ft2demos-2.9.1/ChangeLog 2018-05-02 07:57:20.000000000 +0200 @@ -1,3 +1,100 @@ +2018-05-01 Werner Lemberg <[email protected]> + + * Version 2.9.1 released. + ========================= + + + Tag sources with `VER-2-9-1. + + * README: Updated. + * src/*.1: Updated. + * src/ftinspect/ftinspect.pro: Updated. + +2018-04-26 Alexei Podtelezhnikov <[email protected]> + + * src/ftstring.c (main): Update initializations. + +2018-04-25 Alexei Podtelezhnikov <[email protected]> + + * src/ftstring.c (main): Use size metrics instead of resolution. + * src/ftview.c (Render_Fancy, Render_Stroke): Ditto. + +2018-04-25 Alexei Podtelezhnikov <[email protected]> + + * src/ftgrid.c (gitd_status_init): Set default resolution here... + (parse_cmdline): ... instead of here. + +2018-04-23 Alexei Podtelezhnikov <[email protected]> + + * src/ftcommon.c (FTDemo_Draw_Header): Hide redundant point size. + +2018-04-22 Werner Lemberg <[email protected]> + + * src/ftview.c (Render_Stroke): Avoid double-free in case of error. + +2018-04-22 Alexei Podtelezhnikov <[email protected]> + + * src/ftview.c (Render_Waterfall): Reformulate the step. + +2018-04-20 Alexei Podtelezhnikov <[email protected]> + + [ftview] Display more dramatic waterfalls. + + * src/ftview.c (Render_Waterfall): Start from a small size and + increment so that the requested size is in the middle. + +2018-04-19 Alexei Podtelezhnikov <[email protected]> + + * graph/grobjs.c (grFindColor): Missing case added. + +2018-04-19 Alexei Podtelezhnikov <[email protected]> + + Recycle some code. + + * graph/grfill.c (grFillRect): Call `memcpy' to speed it up. + * src/ftcommon.c (FTDemo_Display_Clear): Call `grFillRect'. + +2018-04-18 Alexei Podtelezhnikov <[email protected]> + + [ftdump] Special case for copyright sign. + + * src/output.c (put_ascii_string{,_size}): Implement it. + +2018-04-18 Alexei Podtelezhnikov <[email protected]> + + * Makefile: Use `info' function of make 3.81. + +2018-04-18 Alexei Podtelezhnikov <[email protected]> + + * src/gbench.c: Missing variable types. + +2018-04-18 Alexei Podtelezhnikov <[email protected]> + + * src/Jamfile: Mention `output.c'. + * objs/.gitignore: Ignore almost everything. + +2018-04-18 Werner Lemberg <[email protected]> + + * Jamrules (FT2_LIB), src/Jamfile (COMMON_LIB): Don't use $(SUFLIB). + + Jam automatically uses them. + +2018-04-17 Werner Lemberg <[email protected]> + + Move `obj' directory to `objs'. + + This is both for consistency with the FreeType library tree and + better jam support. + + * Makefile (OBJ_DIR_2, clean_demo, distclean_demo), mac/Makefile + (OBJ_DIR_2), mac/ftoldmac.m68k_far.make.txt (ObjDir), + mac/ftoldmac.ppc_classic.make.txt (ObjDir), vms_make.com (OBJDIR, + grinit.obj, grx11.obj): Updated. + +2018-01-26 Ben Wagner <[email protected]> + + * src/ftmulti.c (LOG) [DEBUG]: Modernize. + 2018-01-08 Werner Lemberg <[email protected]> * Version 2.9 released. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/Jamrules new/ft2demos-2.9.1/Jamrules --- old/ft2demos-2.9/Jamrules 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/Jamrules 2018-04-22 11:41:50.000000000 +0200 @@ -29,7 +29,7 @@ # FT2_LIB contains the path to the FreeType 2 library object # -FT2_LIB ?= [ FDirName $(FT2_TOP) objs $(LIBPREFIX)freetype$(SUFLIB) ] ; +FT2_LIB ?= [ FDirName $(FT2_TOP) objs $(LIBPREFIX)freetype ] ; # X11_LINKLIBS is only used when compiling the X11 graphics back-end # this should be generated from a "configure" script on Unix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/Makefile new/ft2demos-2.9.1/Makefile --- old/ft2demos-2.9/Makefile 2018-01-07 18:37:38.000000000 +0100 +++ new/ft2demos-2.9.1/Makefile 2018-04-22 11:41:50.000000000 +0200 @@ -60,10 +60,10 @@ ifdef no_config_mk exes: - @echo Please compile the library before the demo programs! + $(info Please compile the library before the demo programs!) clean distclean: - @echo "I need a path to FreeType 2's \`config.mk' to do that!" - @echo "Set the \`TOP_DIR' variable to the correct value." + $(info I need a path to FreeType 2's `config.mk' to do that!) + $(info Set the `TOP_DIR' variable to the correct value.) else @@ -98,7 +98,7 @@ TOP_DIR_2 := $(shell cd $(TOP_DIR_2); pwd) ifneq ($(have_makefile),) BIN_DIR_2 ?= $(TOP_DIR_2)/bin - OBJ_DIR_2 ?= $(TOP_DIR_2)/obj + OBJ_DIR_2 ?= $(TOP_DIR_2)/objs else BIN_DIR_2 ?= . OBJ_DIR_2 ?= . @@ -106,7 +106,7 @@ else ifneq ($(have_makefile),) BIN_DIR_2 ?= bin - OBJ_DIR_2 ?= obj + OBJ_DIR_2 ?= objs else BIN_DIR_2 ?= . OBJ_DIR_2 ?= . @@ -221,11 +221,11 @@ ifdef DOSLIKE clean_demo: - -del obj\*.$(SO) 2> nul + -del objs\*.$(SO) 2> nul -del $(subst /,\,$(TOP_DIR_2)/src/*.bak) 2> nul distclean_demo: clean_demo - -del obj\*.lib 2> nul + -del objs\*.lib 2> nul -del bin\*.exe 2> nul else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/README new/ft2demos-2.9.1/README --- old/ft2demos-2.9/README 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/README 2018-05-02 07:55:59.000000000 +0200 @@ -8,8 +8,8 @@ downloaded one of the stable FreeType 2 source packages from our server, you most probably have to rename its directory, for example: - mv freetype-2.9 freetype2 on Unix - rename freetype-2.9 freetype2 on Windows + mv freetype-2.9.1 freetype2 on Unix + rename freetype-2.9.1 freetype2 on Windows WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/graph/grfill.c new/ft2demos-2.9.1/graph/grfill.c --- old/ft2demos-2.9/graph/grfill.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/graph/grfill.c 2018-04-22 11:41:50.000000000 +0200 @@ -231,6 +231,7 @@ int delta; unsigned char* line; grFillHLineFunc hline_func; + size_t size = 0; if ( x < 0 ) { @@ -253,14 +254,36 @@ if ( width <= 0 || height <= 0 ) return; + line = target->buffer + y*target->pitch; + if ( target->pitch < 0 ) + line -= target->pitch*(target->rows-1); + hline_func = gr_fill_hline_funcs[ target->mode ]; - if ( hline_func ) + + switch ( target->mode ) { - line = target->buffer + y*target->pitch; - if ( target->pitch < 0 ) - line -= target->pitch*(target->rows-1); + case gr_pixel_mode_rgb32: + size += width; + case gr_pixel_mode_rgb24: + size += width; + case gr_pixel_mode_rgb565: + case gr_pixel_mode_rgb555: + size += width; + case gr_pixel_mode_gray: + case gr_pixel_mode_pal8: + size += width; + hline_func( line, x, width, color ); + for ( ; --height > 0; line += target->pitch ) + memcpy( line + target->pitch, line, size ); + break; - for ( ; height > 0; height--, line += target->pitch ) + case gr_pixel_mode_pal4: + case gr_pixel_mode_mono: + for ( ; height-- > 0; line += target->pitch ) hline_func( line, x, width, color ); + break; + + default: + break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/graph/grobjs.c new/ft2demos-2.9.1/graph/grobjs.c --- old/ft2demos-2.9/graph/grobjs.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/graph/grobjs.c 2018-04-22 11:41:50.000000000 +0200 @@ -28,8 +28,16 @@ color.value = (3*red + 6*green + blue)/10; break; + case gr_pixel_mode_rgb555: + color.value = ((red & 0xF8) << 7) | + ((green & 0xF8) << 2) | + ((blue & 0xF8) >> 3); + break; + case gr_pixel_mode_rgb565: - color.value = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + color.value = ((red & 0xF8) << 8) | + ((green & 0xFC) << 3) | + ((blue & 0xF8) >> 3); break; case gr_pixel_mode_rgb24: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/mac/Makefile new/ft2demos-2.9.1/mac/Makefile --- old/ft2demos-2.9/mac/Makefile 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/mac/Makefile 2018-04-22 11:41:50.000000000 +0200 @@ -16,7 +16,7 @@ TOP_DIR ?= ../../freetype2 OBJ_DIR ?= $(TOP_DIR)/objs TOP_DIR_2 ?= .. -OBJ_DIR_2 ?= $(TOP_DIR_2)/obj +OBJ_DIR_2 ?= $(TOP_DIR_2)/objs TOP_DIR_2_MAC ?= $(TOP_DIR_2)/mac ifndef CONFIG_MK @@ -40,7 +40,7 @@ TOP_DIR_2 := $(shell cd $(TOP_DIR_2); pwd) ifneq ($(have_makefile),) BIN_DIR_2 ?= $(TOP_DIR_2)/bin - OBJ_DIR_2 ?= $(TOP_DIR_2)/obj + OBJ_DIR_2 ?= $(TOP_DIR_2)/objs else BIN_DIR_2 ?= .. OBJ_DIR_2 ?= .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/mac/ftoldmac.m68k_far.make.txt new/ft2demos-2.9.1/mac/ftoldmac.m68k_far.make.txt --- old/ft2demos-2.9/mac/ftoldmac.m68k_far.make.txt 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/mac/ftoldmac.m68k_far.make.txt 2018-04-22 11:41:50.000000000 +0200 @@ -7,7 +7,7 @@ \xA5MondoBuild\xA5 = {MAKEFILE} # Make blank to avoid rebuilds when makefile is modified FT2Dir = ::freetype2: -ObjDir = :obj: +ObjDir = :objs: Includes = \xB6 -i "{FT2Dir}include:" \xB6 -i "{FT2Dir}src:" \xB6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/mac/ftoldmac.ppc_classic.make.txt new/ft2demos-2.9.1/mac/ftoldmac.ppc_classic.make.txt --- old/ft2demos-2.9/mac/ftoldmac.ppc_classic.make.txt 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/mac/ftoldmac.ppc_classic.make.txt 2018-04-22 11:41:50.000000000 +0200 @@ -7,7 +7,7 @@ \xA5MondoBuild\xA5 = {MAKEFILE} # Make blank to avoid rebuilds when makefile is modified FT2Dir = ::freetype2: -ObjDir = :obj: +ObjDir = :objs: Includes = \xB6 -i "{FT2Dir}include:" \xB6 -i "{FT2Dir}src:" \xB6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/obj/README new/ft2demos-2.9.1/obj/README --- old/ft2demos-2.9/obj/README 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/obj/README 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -This directory contains all the object files generated for the demonstration programs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/objs/README new/ft2demos-2.9.1/objs/README --- old/ft2demos-2.9/objs/README 1970-01-01 01:00:00.000000000 +0100 +++ new/ft2demos-2.9.1/objs/README 2018-04-22 11:41:50.000000000 +0200 @@ -0,0 +1 @@ +This directory contains all the object files generated for the demonstration programs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/Jamfile new/ft2demos-2.9.1/src/Jamfile --- old/ft2demos-2.9/src/Jamfile 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/src/Jamfile 2018-04-22 11:41:50.000000000 +0200 @@ -7,9 +7,9 @@ SubDirHdrs [ FT2DEMO_SubDir src ] ; SubDirHdrs [ FT2DEMO_SubDir graph ] ; -COMMON_LIB = $(LIBPREFIX)ft2common$(SUFLIB) ; +COMMON_LIB = $(LIBPREFIX)ft2common ; -Library $(COMMON_LIB) : ftcommon.c common.c ; +Library $(COMMON_LIB) : ftcommon.c common.c output.c ; if $(UNIX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftbench.1 new/ft2demos-2.9.1/src/ftbench.1 --- old/ft2demos-2.9/src/ftbench.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftbench.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,5 +1,5 @@ '\" t -.TH FTVIEW 1 "January 2018" "Freetype 2.9" +.TH FTVIEW 1 "May 2018" "Freetype 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftcommon.c new/ft2demos-2.9.1/src/ftcommon.c --- old/ft2demos-2.9/src/ftcommon.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftcommon.c 2018-04-24 06:25:09.000000000 +0200 @@ -162,32 +162,9 @@ FTDemo_Display_Clear( FTDemo_Display* display ) { grBitmap* bit = display->bitmap; - int pitch = bit->pitch; - if ( pitch < 0 ) - pitch = -pitch; - - if ( bit->mode == gr_pixel_mode_gray ) - memset( bit->buffer, - display->back_color.value, - (unsigned int)( pitch * bit->rows ) ); - else - { - unsigned char* p = bit->buffer; - int i; - - - for ( i = 0; i < pitch; i += 3, p += 3 ) - { - p[0] = display->back_color.chroma[0]; - p[1] = display->back_color.chroma[1]; - p[2] = display->back_color.chroma[2]; - } - - for ( i = 1; i < bit->rows; i++, p += pitch ) - memcpy( p, p - pitch, (size_t)pitch ); - } + grFillRect( bit, 0, 0, bit->width, bit->rows, display->back_color ); } @@ -765,6 +742,7 @@ FT_Face face; char buf[256]; const char* basename; + int ppem; int line = 0; int x; @@ -787,44 +765,33 @@ grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT, buf, display->fore_color ); - /* instance, pt and dpi */ - if ( face->face_index >> 16 ) - x = sprintf( buf, "instance %ld/%ld, %gpt at %ddpi ", - face->face_index >> 16, - face->style_flags >> 16, - ptsize / 64.0, res ); + /* ppem, pt and dpi, instance */ + ppem = FT_IS_SCALABLE( face ) ? FT_MulFix( face->units_per_EM, + face->size->metrics.y_scale ) + : face->size->metrics.y_ppem * 64; + + if ( res == 72 ) + x = sprintf( buf, "%.4g ppem", ppem / 64.0 ); else - x = sprintf( buf, "%gpt at %ddpi ", - ptsize / 64.0, res ); + x = sprintf( buf, "%g pt at %d dpi, %.4g ppem", + ptsize / 64.0, res, ppem / 64.0 ); + + if ( face->face_index >> 16 ) + x += sprintf( buf + x, ", instance %ld/%ld", + face->face_index >> 16, + face->style_flags >> 16 ); grWriteCellString( display->bitmap, 0, line * HEADER_HEIGHT, buf, display->fore_color ); - if ( error_code == FT_Err_Ok ) - { - int highlight; - - - highlight = abs( ptsize * res - face->size->metrics.y_ppem * 72 * 64 ) - > 36 * 64; - - /* ppem */ - if ( FT_IS_SCALABLE( face ) ) - sprintf( buf, "(%.4gppem)", - FT_MulFix( face->units_per_EM, - face->size->metrics.y_scale ) / 64.0 ); - else - sprintf( buf, "(%dppem)", - face->size->metrics.y_ppem ); - grWriteCellString( display->bitmap, 8 * x, line * HEADER_HEIGHT, - buf, highlight ? display->warn_color - : display->fore_color ); - } - else + if ( abs( ptsize * res / 64 - face->size->metrics.y_ppem * 72 ) > 36 || + error_code ) { - /* errors */ switch ( error_code ) { + case FT_Err_Ok: + sprintf( buf, "Available size shown" ); + break; case FT_Err_Invalid_Pixel_Size: sprintf( buf, "Invalid pixel size" ); break; @@ -832,10 +799,9 @@ sprintf( buf, "Invalid ppem value" ); break; default: - sprintf( buf, "error 0x%04x", - (FT_UShort)error_code ); + sprintf( buf, "Error 0x%04x", (FT_UShort)error_code ); } - grWriteCellString( display->bitmap, 8 * x, line * HEADER_HEIGHT, + grWriteCellString( display->bitmap, 8 * x + 16, line * HEADER_HEIGHT, buf, display->warn_color ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftdiff.1 new/ft2demos-2.9.1/src/ftdiff.1 --- old/ft2demos-2.9/src/ftdiff.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftdiff.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTDIFF 1 "January 2018" "FreeType 2.9" +.TH FTDIFF 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftdump.1 new/ft2demos-2.9.1/src/ftdump.1 --- old/ft2demos-2.9/src/ftdump.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftdump.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTDUMP 1 "January 2018" "FreeType 2.9" +.TH FTDUMP 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftgamma.1 new/ft2demos-2.9.1/src/ftgamma.1 --- old/ft2demos-2.9/src/ftgamma.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftgamma.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTGAMMA 1 "January 2018" "FreeType 2.9" +.TH FTGAMMA 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftgrid.1 new/ft2demos-2.9.1/src/ftgrid.1 --- old/ft2demos-2.9/src/ftgrid.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftgrid.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTGRID 1 "January 2018" "Freetype 2.9" +.TH FTGRID 1 "May 2018" "Freetype 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftgrid.c new/ft2demos-2.9.1/src/ftgrid.c --- old/ft2demos-2.9/src/ftgrid.c 2018-01-06 08:31:40.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftgrid.c 2018-04-26 06:39:13.000000000 +0200 @@ -165,6 +165,7 @@ { st->width = DIM_X; st->height = DIM_Y; + st->res = 72; st->scale = 64; st->x_origin = 0; @@ -1977,9 +1978,6 @@ if ( status.ptsize == 0 ) status.ptsize = 64 * 10; - if ( status.res <= 0 ) - status.res = 72; - (*argc)--; (*argv)++; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftinspect/ftinspect.pro new/ft2demos-2.9.1/src/ftinspect/ftinspect.pro --- old/ft2demos-2.9/src/ftinspect/ftinspect.pro 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftinspect/ftinspect.pro 2018-05-02 07:55:59.000000000 +0200 @@ -13,7 +13,7 @@ PKGCONFIG += libpng harfbuzz zlib bzip2 } win32 { - LIBS += ../../../freetyp2/objs/vc2010/freetype29.lib + LIBS += ../../../freetyp2/objs/vc2010/freetype291.lib LIBS += -lpng -lharfbuzz -lz -lbz2 -lm } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftlint.1 new/ft2demos-2.9.1/src/ftlint.1 --- old/ft2demos-2.9/src/ftlint.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftlint.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTLINT 1 "January 2018" "Freetype 2.9" +.TH FTLINT 1 "May 2018" "Freetype 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftmulti.1 new/ft2demos-2.9.1/src/ftmulti.1 --- old/ft2demos-2.9/src/ftmulti.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftmulti.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTMULTI 1 "January 2018" "Freetype 2.9" +.TH FTMULTI 1 "May 2018" "Freetype 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftmulti.c new/ft2demos-2.9.1/src/ftmulti.c --- old/ft2demos-2.9/src/ftmulti.c 2018-01-06 08:32:49.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftmulti.c 2018-04-22 11:41:50.000000000 +0200 @@ -112,7 +112,7 @@ #define DEBUGxxx #ifdef DEBUG -#define LOG( x ) LogMessage##x +#define LOG( x ) LogMessage x #else #define LOG( x ) /* empty */ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftstring.1 new/ft2demos-2.9.1/src/ftstring.1 --- old/ft2demos-2.9/src/ftstring.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftstring.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTSTRING 1 "January 2018" "Freetype 2.9" +.TH FTSTRING 1 "May 2018" "Freetype 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftstring.c new/ft2demos-2.9.1/src/ftstring.c --- old/ft2demos-2.9/src/ftstring.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftstring.c 2018-04-27 07:31:30.000000000 +0200 @@ -100,7 +100,7 @@ } status = { DIM_X, DIM_Y, RENDER_MODE_STRING, FT_ENCODING_UNICODE, 72, 48, 0, NULL, - { 0, 0, 0, 0, NULL }, + { 0, 0, 0x8000, 0, NULL }, { 0 }, { 0, 0, 0, 0 }, 0, NULL, { 0 } }; static FTDemo_Display* display; @@ -720,7 +720,6 @@ switch ( status.render_mode ) { case RENDER_MODE_STRING: - status.sc.center = 1L << 15; error = FTDemo_String_Draw( handle, display, &status.sc, display->bitmap->width / 2, @@ -729,24 +728,20 @@ case RENDER_MODE_KERNCMP: { - FTDemo_String_Context sc = status.sc; + FT_Size size; + FTDemo_String_Context sc = { 0, 0, 0, 0, NULL }; FT_Int x, y; FT_Int height; x = 55; - height = ( status.ptsize * status.res / 72 + 32 ) >> 6; + FTDemo_Get_Size( handle, &size ); + height = size->metrics.y_ppem; if ( height < CELLSTRING_HEIGHT ) height = CELLSTRING_HEIGHT; /* First line: none */ - sc.center = 0; - sc.kerning_mode = 0; - sc.kerning_degree = 0; - sc.vertical = 0; - sc.matrix = NULL; - y = CELLSTRING_HEIGHT * 2 + display->bitmap->rows / 4 + height; grWriteCellString( display->bitmap, 5, y - ( height + CELLSTRING_HEIGHT ) / 2, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftvalid.1 new/ft2demos-2.9.1/src/ftvalid.1 --- old/ft2demos-2.9/src/ftvalid.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftvalid.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTVALID 1 "January 2018" "FreeType 2.9" +.TH FTVALID 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftview.1 new/ft2demos-2.9.1/src/ftview.1 --- old/ft2demos-2.9/src/ftview.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftview.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH FTVIEW 1 "January 2018" "FreeType 2.9" +.TH FTVIEW 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ftview.c new/ft2demos-2.9.1/src/ftview.c --- old/ft2demos-2.9/src/ftview.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/src/ftview.c 2018-04-26 06:39:13.000000000 +0200 @@ -196,8 +196,7 @@ face = size->face; slot = face->glyph; - radius = (FT_Fixed)( - status.radius * ( status.ptsize * status.res / 72 ) ); + radius = (FT_Fixed)( size->metrics.y_ppem * 64 * status.radius ); FT_Stroker_Set( handle->stroker, radius, FT_STROKER_LINECAP_ROUND, @@ -249,10 +248,10 @@ error = FTDemo_Draw_Glyph( handle, display, glyph, &x, &y ); - FT_Done_Glyph( glyph ); - if ( error ) goto Next; + else + FT_Done_Glyph( glyph ); if ( !have_topleft ) { @@ -314,9 +313,8 @@ shear.yx = 0; shear.yy = 1 << 16; - ystr = status.ptsize * status.res / 72; - xstr = (FT_Pos)( status.xbold_factor * ystr ); - ystr = (FT_Pos)( status.ybold_factor * ystr ); + xstr = (FT_Pos)( size->metrics.y_ppem * 64 * status.xbold_factor ); + ystr = (FT_Pos)( size->metrics.y_ppem * 64 * status.ybold_factor ); have_topleft = 0; @@ -570,11 +568,11 @@ static FT_Error - Render_Waterfall( int first_size, + Render_Waterfall( int mid_size, int offset ) { int start_x, start_y, step_y, x, y; - int pt_size, max_size = 100000; + int pt_size, step, pt_height; FT_Size size; int have_topleft, start; @@ -588,12 +586,18 @@ have_topleft = 0; - for ( pt_size = first_size; pt_size < max_size; pt_size += 64 ) + pt_height = 64 * 72 * status.height / status.res; + step = ( mid_size * mid_size / pt_height + 64 ) & ~63; + pt_size = mid_size - step * ( mid_size / step ); /* remainder */ + + while ( 1 ) { int first = offset; int ch; + pt_size += step; + FTDemo_Set_Current_Charsize( handle, pt_size, status.res ); error = FTDemo_Get_Size( handle, &size ); @@ -673,7 +677,7 @@ } } - FTDemo_Set_Current_Charsize( handle, first_size, status.res ); + FTDemo_Set_Current_Charsize( handle, mid_size, status.res ); FTDemo_Get_Size( handle, &size ); return FT_Err_Ok; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/gbench.c new/ft2demos-2.9.1/src/gbench.c --- old/ft2demos-2.9/src/gbench.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/src/gbench.c 2018-04-22 11:41:50.000000000 +0200 @@ -60,9 +60,9 @@ static CKeyRec ckeys [ ALGO_KEY_COUNT ]; static unsigned char cgrades[ ALGO_KEY_COUNT * ALGO_GRADE_COUNT * 3 ]; - static chits = 0; - static cmiss1 = 0; - static cmiss2 = 0; + static long chits = 0; + static long cmiss1 = 0; + static long cmiss2 = 0; /* clear the cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/output.c new/ft2demos-2.9.1/src/output.c --- old/ft2demos-2.9/src/output.c 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/src/output.c 2018-04-22 11:41:50.000000000 +0200 @@ -71,6 +71,12 @@ *out++ = '"'; break; + case 0xA9: + *out++ = '('; + *out++ = 'c'; + *out++ = ')'; + break; + default: if ( string[i] < 0x80 ) *out++ = (char)string[i]; @@ -126,6 +132,10 @@ len += 2; break; + case 0xA9: + len += 3; + break; + default: if ( string[i] < 0x80 ) len += 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/src/ttdebug.1 new/ft2demos-2.9.1/src/ttdebug.1 --- old/ft2demos-2.9/src/ttdebug.1 2018-01-08 12:27:50.000000000 +0100 +++ new/ft2demos-2.9.1/src/ttdebug.1 2018-05-02 07:55:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH TTDEBUG 1 "January 2018" "FreeType 2.9" +.TH TTDEBUG 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.9/vms_make.com new/ft2demos-2.9.1/vms_make.com --- old/ft2demos-2.9/vms_make.com 2018-01-02 09:37:16.000000000 +0100 +++ new/ft2demos-2.9.1/vms_make.com 2018-04-22 11:41:50.000000000 +0200 @@ -94,7 +94,7 @@ SRCDIR = [.src] GRAPHSRC = [.graph] GRX11SRC = [.graph.x11] -OBJDIR = [.obj] +OBJDIR = [.objs] # include paths INCLUDES = /include=([-.freetype2.include],[.graph]) @@ -153,11 +153,11 @@ $(OBJDIR)gblblit.obj : $(GRAPHSRC)gblblit.c $(OBJDIR)grinit.obj : $(GRAPHSRC)grinit.c set def $(GRAPHSRC) - $(CC)$(CCOPT)/include=([.x11],[])/define=(DEVICE_X11)/obj=[-.obj] grinit.c + $(CC)$(CCOPT)/include=([.x11],[])/define=(DEVICE_X11)/obj=[-.objs] grinit.c set def [-] $(OBJDIR)grx11.obj : $(GRX11SRC)grx11.c set def $(GRX11SRC) - $(CC)$(CCOPT)/obj=[--.obj]/include=([-]) grx11.c + $(CC)$(CCOPT)/obj=[--.objs]/include=([-]) grx11.c set def [--] $(OBJDIR)grdevice.obj : $(GRAPHSRC)grdevice.c $(OBJDIR)ftmulti.obj : $(SRCDIR)ftmulti.c
![https://pledgie.com/campaigns/24434.png?skin_name=chrome"](https://pledgie.com/campaigns/24434.png?skin_name=chrome"){kind=link}
![https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif"){kind=link}
![https://button.flattr.com/flattr-badge-large.png"](https://button.flattr.com/flattr-badge-large.png"){kind=link}
![https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"](https://www.paypalobjects.com/de_DE/i/scr/pixel.gif"){kind=link}