Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at 2014-03-18 16:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetype2 (Old) and /work/SRC/openSUSE:Factory/.freetype2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetype2" Changes: -------- --- /work/SRC/openSUSE:Factory/freetype2/freetype2.changes 2013-12-19 12:40:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freetype2.new/freetype2.changes 2014-03-18 16:21:13.000000000 +0100 @@ -1,0 +2,59 @@ +Thu Mar 13 03:14:26 UTC 2014 - [email protected] + +- Improve don-t-mark-libpng-as-required-library.patch: also handle + Requires.private case (freetype does not include png headers) + +------------------------------------------------------------------- +Sun Mar 9 18:39:56 UTC 2014 - [email protected] + +- Update to version 2.5.3 + * IMPORTANT BUG FIXES + - A vulnerability was identified and fixed in the new CFF + driver (cf. http://savannah.nongnu.org/bugs/?41697; it + doesn't have a CVE number yet). All users should upgrade. + - More bug fixes related to correct positioning of + composite glyphs. + - Many fixes to better protect against malformed input. + * IMPORTANT CHANGES + - FreeType can now use the HarfBuzz library to greatly improve + the auto-hinting of fonts that use OpenType features: + Many glyphs that are part of such features but don't have + cmap entries are now handled properly, for example small + caps or superscripts. Define the configuration macro + FT_CONFIG_OPTION_USE_HARFBUZZ to activate HarfBuzz support. + You need HarfBuzz version 0.9.19 or newer. Note that HarfBuzz + depends on FreeType; this currently causes a chicken-and-egg + problem that can be solved as follows in case HarfBuzz + is not yet installed on your system. + 1. Compile and install FreeType without the configuration + macro FT_CONFIG_OPTION_USE_HARFBUZZ. + 2. Compile and install HarfBuzz. + 3. Define macro FT_CONFIG_OPTION_USE_HARFBUZZ, then + compile and install FreeType again. + With FreeType's `configure' script the procedure boils + down to configure, build, and install Freetype, then + configure, compile, and install HarfBuzz, then configure, + compile, and install FreeType again (after executing + `make distclean'). + - All libraries FreeType depends on are now checked + using the `pkg-config' configuration files first, + followed by alternative methods. + - The new value `auto' for the various `--with-XXX' + library options (for example `--with-harfbuzz=auto') + makes the `configure' script automatically link to the + libraries it finds. This is now the default. + - In case FreeType's `configure' script can't find a + library, you can pass environment variables to circumvent + pkg-config, and those variables have been harmonized as + a consequence of the changes mentioned above: + LIBZ -> removed; use LIBZ_CFLAGS and LIBZ_LIBS + LIBBZ2 -> removed; use BZIP2_CFLAGS and BZIP2_LIBS + LIBPNG_LDFLAGS -> LIBPNG_LIBS + `./configure --help' shows all available environment variables. + - The `freetype-config' script now understands + option `--static' to emit static linking information. +- Due to buildsystem changes, rename and rebase + don-t-mark-libpng-as-required-library-in-freetype-co.patch to + don-t-mark-libpng-as-required-library.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/freetype2/ft2demos.changes 2013-12-19 12:40:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freetype2.new/ft2demos.changes 2014-03-18 16:21:13.000000000 +0100 @@ -1,0 +2,59 @@ +Thu Mar 13 03:14:26 UTC 2014 - [email protected] + +- Improve don-t-mark-libpng-as-required-library.patch: also handle + Requires.private case (freetype does not include png headers) + +------------------------------------------------------------------- +Sun Mar 9 18:39:56 UTC 2014 - [email protected] + +- Update to version 2.5.3 + * IMPORTANT BUG FIXES + - A vulnerability was identified and fixed in the new CFF + driver (cf. http://savannah.nongnu.org/bugs/?41697; it + doesn't have a CVE number yet). All users should upgrade. + - More bug fixes related to correct positioning of + composite glyphs. + - Many fixes to better protect against malformed input. + * IMPORTANT CHANGES + - FreeType can now use the HarfBuzz library to greatly improve + the auto-hinting of fonts that use OpenType features: + Many glyphs that are part of such features but don't have + cmap entries are now handled properly, for example small + caps or superscripts. Define the configuration macro + FT_CONFIG_OPTION_USE_HARFBUZZ to activate HarfBuzz support. + You need HarfBuzz version 0.9.19 or newer. Note that HarfBuzz + depends on FreeType; this currently causes a chicken-and-egg + problem that can be solved as follows in case HarfBuzz + is not yet installed on your system. + 1. Compile and install FreeType without the configuration + macro FT_CONFIG_OPTION_USE_HARFBUZZ. + 2. Compile and install HarfBuzz. + 3. Define macro FT_CONFIG_OPTION_USE_HARFBUZZ, then + compile and install FreeType again. + With FreeType's `configure' script the procedure boils + down to configure, build, and install Freetype, then + configure, compile, and install HarfBuzz, then configure, + compile, and install FreeType again (after executing + `make distclean'). + - All libraries FreeType depends on are now checked + using the `pkg-config' configuration files first, + followed by alternative methods. + - The new value `auto' for the various `--with-XXX' + library options (for example `--with-harfbuzz=auto') + makes the `configure' script automatically link to the + libraries it finds. This is now the default. + - In case FreeType's `configure' script can't find a + library, you can pass environment variables to circumvent + pkg-config, and those variables have been harmonized as + a consequence of the changes mentioned above: + LIBZ -> removed; use LIBZ_CFLAGS and LIBZ_LIBS + LIBBZ2 -> removed; use BZIP2_CFLAGS and BZIP2_LIBS + LIBPNG_LDFLAGS -> LIBPNG_LIBS + `./configure --help' shows all available environment variables. + - The `freetype-config' script now understands + option `--static' to emit static linking information. +- Due to buildsystem changes, rename and rebase + don-t-mark-libpng-as-required-library-in-freetype-co.patch to + don-t-mark-libpng-as-required-library.patch + +------------------------------------------------------------------- Old: ---- don-t-mark-libpng-as-required-library-in-freetype-co.patch freetype-2.5.2.tar.bz2 freetype-doc-2.5.2.tar.bz2 ft2demos-2.5.2.tar.bz2 New: ---- don-t-mark-libpng-as-required-library.patch freetype-2.5.3.tar.bz2 freetype-doc-2.5.3.tar.bz2 ft2demos-2.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.F0HZ2x/_old 2014-03-18 16:21:14.000000000 +0100 +++ /var/tmp/diff_new_pack.F0HZ2x/_new 2014-03-18 16:21:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package freetype2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,8 @@ Obsoletes: freetype2-64bit %endif # -%define doc_version 2.5.2 -Version: 2.5.2 +%define doc_version 2.5.3 +Version: 2.5.3 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -41,8 +41,8 @@ Patch200: freetype2-subpixel.patch # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer Patch201: overflow.patch -# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library-in-freetype-co.patch -- it is private in .pc -Patch202: don-t-mark-libpng-as-required-library-in-freetype-co.patch +# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc +Patch202: don-t-mark-libpng-as-required-library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -125,5 +125,6 @@ %{_libdir}/pkgconfig/freetype2.pc %{_bindir}/* %{_datadir}/aclocal +%{_mandir}/man1/freetype-config* %changelog ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.F0HZ2x/_old 2014-03-18 16:21:14.000000000 +0100 +++ /var/tmp/diff_new_pack.F0HZ2x/_new 2014-03-18 16:21:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ft2demos # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: ft2demos -Version: 2.5.2 +Version: 2.5.3 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ Group: Productivity/Publishing/Other -%define freetype_version 2.5.2 +%define freetype_version 2.5.3 Url: http://www.freetype.org Source0: http://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 @@ -30,8 +30,8 @@ Patch200: freetype2-subpixel.patch # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer Patch201: overflow.patch -# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library-in-freetype-co.patch -- it is private in .pc -Patch202: don-t-mark-libpng-as-required-library-in-freetype-co.patch +# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc +Patch202: don-t-mark-libpng-as-required-library.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel Conflicts: dtc ++++++ don-t-mark-libpng-as-required-library-in-freetype-co.patch -> don-t-mark-libpng-as-required-library.patch ++++++ --- /work/SRC/openSUSE:Factory/freetype2/don-t-mark-libpng-as-required-library-in-freetype-co.patch 2013-12-19 12:40:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freetype2.new/don-t-mark-libpng-as-required-library.patch 2014-03-18 16:21:13.000000000 +0100 @@ -1,39 +1,48 @@ -From 752bf00d315bee455eab3b31009894141ca8efca Mon Sep 17 00:00:00 2001 +From cef195062aa7f509a60b8765661ba4babd85b79c Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> -Date: Thu, 12 Dec 2013 17:41:19 +0100 -Subject: [PATCH 1/1] Don't mark libpng as required library in freetype-config +Date: Sun, 9 Mar 2014 20:09:12 +0100 +Subject: [PATCH 1/1] Don't mark libpng as required library It is private in .pc anyway --- - builds/unix/freetype-config.in | 2 +- - builds/unix/unix-def.in | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in -index e4c504d..2fdf39f 100644 ---- a/builds/unix/freetype-config.in -+++ b/builds/unix/freetype-config.in -@@ -137,7 +137,7 @@ if test "$echo_cflags" = "yes" ; then - fi - - if test "$echo_libs" = "yes" ; then -- libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%" -+ libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%" - if test "${SYSROOT}$libdir" != "/usr/lib" && - test "${SYSROOT}$libdir" != "/usr/lib64"; then - echo -L${SYSROOT}$libdir $libs -diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in -index 491e974..ae2e3c5 100644 ---- a/builds/unix/unix-def.in -+++ b/builds/unix/unix-def.in -@@ -103,7 +103,6 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in - sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \ - -e 's|%LIBBZ2%|$(LIBBZ2)|' \ - -e 's|%LIBZ%|$(LIBZ)|' \ -- -e 's|%LIBPNG%|$(LIBPNG)|' \ - -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ - -e 's|%exec_prefix%|$(exec_prefix)|' \ - -e 's|%ft_version%|$(ft_version)|' \ --- -1.8.5 +diff --git a/builds/unix/configure b/builds/unix/configure +index 4ae00dd..c3101e2 100755 +--- a/builds/unix/configure ++++ b/builds/unix/configure +@@ -13692,7 +13692,6 @@ esac + # entries in Requires.private are separated by commas; + REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ +- $libpng_reqpriv, \ + $harfbuzz_reqpriv" + # beautify + REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ +@@ -13718,7 +13717,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + LIBS_CONFIG="-lfreetype \ + $ZLIB_LIBS \ + $BZIP2_LIBS \ +- $LIBPNG_LIBS \ + $HARFBUZZ_LIBS \ + $ft2_extra_libs" + # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later +diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw +index dd7e576..bac2645 100644 +--- a/builds/unix/configure.raw ++++ b/builds/unix/configure.raw +@@ -914,7 +914,6 @@ esac + # entries in Requires.private are separated by commas; + REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ +- $libpng_reqpriv, \ + $harfbuzz_reqpriv" + # beautify + REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ +@@ -940,7 +939,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + LIBS_CONFIG="-lfreetype \ + $ZLIB_LIBS \ + $BZIP2_LIBS \ +- $LIBPNG_LIBS \ + $HARFBUZZ_LIBS \ + $ft2_extra_libs" + # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later ++++++ freetype-2.5.2.tar.bz2 -> freetype-2.5.3.tar.bz2 ++++++ ++++ 61694 lines of diff (skipped) ++++++ freetype-doc-2.5.2.tar.bz2 -> freetype-doc-2.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-1.html new/freetype-2.5.3/docs/glyphs/glyphs-1.html --- old/freetype-2.5.2/docs/glyphs/glyphs-1.html 2013-08-07 09:49:24.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/glyphs-1.html 2014-03-04 09:36:00.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-2.html new/freetype-2.5.3/docs/glyphs/glyphs-2.html --- old/freetype-2.5.2/docs/glyphs/glyphs-2.html 2013-08-07 09:49:24.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/glyphs-2.html 2014-03-04 09:36:09.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-3.html new/freetype-2.5.3/docs/glyphs/glyphs-3.html --- old/freetype-2.5.2/docs/glyphs/glyphs-3.html 2013-12-04 07:03:04.000000000 +0100 +++ new/freetype-2.5.3/docs/glyphs/glyphs-3.html 2014-03-04 09:36:05.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-4.html new/freetype-2.5.3/docs/glyphs/glyphs-4.html --- old/freetype-2.5.2/docs/glyphs/glyphs-4.html 2013-08-07 09:49:24.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/glyphs-4.html 2014-03-04 09:36:07.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-5.html new/freetype-2.5.3/docs/glyphs/glyphs-5.html --- old/freetype-2.5.2/docs/glyphs/glyphs-5.html 2013-08-07 09:49:24.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/glyphs-5.html 2014-03-04 09:36:11.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-6.html new/freetype-2.5.3/docs/glyphs/glyphs-6.html --- old/freetype-2.5.2/docs/glyphs/glyphs-6.html 2013-08-07 09:50:57.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/glyphs-6.html 2014-03-04 09:36:03.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/glyphs-7.html new/freetype-2.5.3/docs/glyphs/glyphs-7.html --- old/freetype-2.5.2/docs/glyphs/glyphs-7.html 2013-08-07 09:49:24.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/glyphs-7.html 2014-03-04 09:36:02.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.5.2/docs/glyphs/index.html new/freetype-2.5.3/docs/glyphs/index.html --- old/freetype-2.5.2/docs/glyphs/index.html 2013-08-07 09:49:24.000000000 +0200 +++ new/freetype-2.5.3/docs/glyphs/index.html 2014-03-04 09:36:13.000000000 +0100 @@ -16,7 +16,6 @@ content="David Turner"> <link rel="icon" - sizes="16x16" href="../../../image/favicon_-90.ico"> <link rel="shortcut icon" href="../../../image/favicon_-90.ico"> @@ -25,7 +24,7 @@ href="../../../freetype2_-90.css"> <script type="text/javascript" - src="../../../jquery-1.8.3.min.js"> + src="../../../jquery-1.11.0.min.js"> </script> <script type="text/javascript" src="../../../jquery.ba-resize.min.js"> ++++++ ft2demos-2.5.2.tar.bz2 -> ft2demos-2.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/ChangeLog new/ft2demos-2.5.3/ChangeLog --- old/ft2demos-2.5.2/ChangeLog 2013-12-08 23:33:30.000000000 +0100 +++ new/ft2demos-2.5.3/ChangeLog 2014-03-06 23:09:43.000000000 +0100 @@ -1,3 +1,72 @@ +2014-03-06 Werner Lemberg <[email protected]> + + * Version 2.5.3 released. + ========================= + + + Tag sources with `VER-2-5-3'. + + * README: Updated. + * src/*.1: Updated. + +2014-03-04 Werner Lemberg <[email protected]> + + * Makefile (LINK_LIBS) [unixdev]: Don't use pkg-config for bzip2. + + Not all platforms have `bzip2.pc'. We also add `-lz' just for + completeness. + +2014-01-30 Werner Lemberg <[email protected]> + + [ftbench] Allow `-s 0' for better testing of FT_LOAD_NO_SCALE. + + * src/ftbench.c (main) <'s'>: Don't alter value 0. + Don't call `FT_Set_Pixel_Sizes' for size == 0. + Don't call tests for size == 0 that need valid scaling factors. + (usage): Updated. + (benchmark): Return meaningful timer value for error-only calls. + (test_embolden): Enable test. I think there is no longer a reason + to not run it. + + * src/ftbench.1: Updated. + +2014-01-28 Werner Lemberg <[email protected]> + + * src/ftgrid.c (grid_status_rescale_initial): Avoid NaN values. + Remove forgotten debug message. + +2014-01-28 Werner Lemberg <[email protected]> + + * graph/grblit.c (grBlitGlyphToBitmap): Don't crash on empty glyphs. + Problem reported by Dave Arnold <[email protected]>. + +2014-01-03 Werner Lemberg <[email protected]> + + [ftgrid] Show (some) blue zones. + + * src/ftgrid.c (af_glyph_hints_get_segment_offset): Update + prototype. + (GridStatucRec): New member `blue_color'. + (grid_status_display): Change `on' color to red. + Set `blue' color. + (grid_hint_draw_segment): Show associated blue zones. + (event_help): Updated. + +2014-01-03 Werner Lemberg <[email protected]> + + [ftgrid] Minor. + + * src/ftgrid.c (GridStatusRec): Rename `conic_color' to `off_color'. + Remove unused `cubic_color' member. + (grid_status_display, grid_status_draw_outline): Updated. + +2013-12-22 Werner Lemberg <[email protected]> + + * Makefile (LINK_LIBS) [unixdev]: Use pkg-config to get link flags. + + This corresponds to a similar change in current FreeType to link + with HarfBuzz in development mode. + 2013-12-08 Werner Lemberg <[email protected]> * Version 2.5.2 released. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/Makefile new/ft2demos-2.5.3/Makefile --- old/ft2demos-2.5.2/Makefile 2013-12-08 23:30:10.000000000 +0100 +++ new/ft2demos-2.5.3/Makefile 2014-03-04 08:39:54.000000000 +0100 @@ -160,7 +160,8 @@ else LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS)) ifeq ($(PLATFORM),unixdev) - LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lbz2 -lpng + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lz -lbz2 + LINK_LIBS += $(shell pkg-config --libs libpng harfbuzz) else LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/README new/ft2demos-2.5.3/README --- old/ft2demos-2.5.2/README 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/README 2014-03-06 23:11:49.000000000 +0100 @@ -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.5.2 freetype2 on Unix - rename freetype-2.5.2 freetype2 on Windows + mv freetype-2.5.3 freetype2 on Unix + rename freetype-2.5.3 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.5.2/graph/grblit.c new/ft2demos-2.5.3/graph/grblit.c --- old/ft2demos-2.5.2/graph/grblit.c 2013-05-29 10:48:10.000000000 +0200 +++ new/ft2demos-2.5.3/graph/grblit.c 2014-01-28 04:37:14.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2002, 2009, 2011 by */ +/* Copyright 1996-2002, 2009, 2011, 2014 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* grblit.c: Support for blitting of bitmaps with various depth. */ @@ -1846,6 +1846,12 @@ return -1; } + if ( !glyph->rows || !glyph->width ) + { + /* nothing to do */ + return 0; + } + /* short cut to alpha blender for certain glyph types */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftbench.1 new/ft2demos-2.5.3/src/ftbench.1 --- old/ft2demos-2.5.2/src/ftbench.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftbench.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,5 @@ -.TH FTVIEW 1 "December 2013" "Freetype 2.5.2" +'\" t +.TH FTVIEW 1 "March 2013" "Freetype 2.5.3" . . .SH NAME @@ -39,7 +40,9 @@ .BI \-f \ l Use hexadecimal number .I l -as load flags (see `FT_LOAD_XXX'). +as load flags (see +.RB ` FT_LOAD_XXX ' +macros in the FreeType reference). . .TP .B \-H @@ -64,24 +67,18 @@ .TP .BI \-r \ n Set render mode to -.I n +.IR n : . .RS -.TP -.B 0 -normal -.TP -.B 1 -light -.TP -.B 2 -mono -.TP -.B 3 -horizontal LCD -.TP -.B 4 -vertical LCD +.TS +tab (@); +rB l. +0@normal +1@light +2@mono +3@horizontal LCD +4@verical LCD +.TE .RE . .IP @@ -92,48 +89,38 @@ Use .I s ppem as face size (default is 10ppem). +If set to zero, don't call +.BR FT_Set_Pixel_Sizes . +Use value\ 0 with option +.RB ` "-f\ 1" ' +or something similar to load the glyphs unscaled, +otherwise errors will show up. . .TP .BI \-t \ t Use at most .I t -seconds per bench (default is 2). +seconds per test (default is 2). . .TP .BI \-b \ tests Perform chosen tests: . .RS -.TP -.B a -load a glyph (FT_Load_Glyph) -.TP -.B b -load advance widths (FT_Get_Advances) -.TP -.B c -render a glyph (FT_Render_Glyph) -.TP -.B d -load a glyph (FT_Get_Glyph) -.TP -.B e -get glyph cbox (FT_Glyph_Get_CBox) -.TP -.B f -get glyph indices (FT_Get_Char_Index) -.TP -.B g -iterate CMap (FT_Get_{First,Next}_Char) -.TP -.B h -open a new face (FT_New_Face) -.TP -.B i -embolden (FT_GlyphSlot_Embolden) -.TP -.B j -get glyph bbox (FT_Outline_Get_BBox) +.TS +tab (@); +rB l. +a@load a glyph (FT_Load_Glyph) +b@load advance widths (FT_Get_Advances) +c@render a glyph (FT_Render_Glyph) +d@load a glyph (FT_Get_Glyph) +e@get glyph cbox (FT_Glyph_Get_CBox) +f@get glyph indices (FT_Get_Char_Index) +g@iterate CMap (FT_Get_{First,Next}_Char) +h@open a new face (FT_New_Face) +i@embolden (FT_GlyphSlot_Embolden) +j@get glyph bbox (FT_Outline_Get_BBox) +.TE .RE . .IP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftbench.c new/ft2demos-2.5.3/src/ftbench.c --- old/ft2demos-2.5.2/src/ftbench.c 2013-10-27 11:35:40.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftbench.c 2014-01-31 08:16:04.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2002-2006, 2009, 2010, 2013 by */ +/* Copyright 2002-2006, 2009, 2010, 2013, 2014 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* ftbench: bench some common FreeType call paths */ @@ -193,7 +193,7 @@ { if ( !cache_man ) { - printf( " %-25s: no cache manager\n", test->title ); + printf( " %-25s no cache manager\n", test->title ); return; } @@ -221,7 +221,10 @@ break; } - printf( "%5.3f us/op\n", TIMER_GET( &timer ) * 1E6 / (double)done ); + if ( done ) + printf( "%5.3f us/op\n", TIMER_GET( &timer ) * 1E6 / (double)done ); + else + printf( "no error-free calls\n" ); } @@ -321,7 +324,7 @@ continue; TIMER_START( timer ); - /* FT_GlyphSlot_Embolden ( face->glyph ); */ + FT_GlyphSlot_Embolden( face->glyph ); done++; TIMER_STOP( timer ); } @@ -738,7 +741,10 @@ " -r N Set render mode to N\n" " 0: normal, 1: light, 2: mono, 3: LCD, 4: LCD vertical\n" " (default is 0).\n" - " -s S Use S ppem as face size (default is %dppem).\n", + " -s S Use S ppem as face size (default is %dppem).\n" + " If set to zero, don't call FT_Set_Pixel_Sizes.\n" + " Use value 0 with option `-f 1' or something similar to\n" + " load the glyphs unscaled, otherwise errors will show up.\n", FACE_SIZE ); fprintf( stderr, " -t T Use at most T seconds per bench (default is %.0f).\n" @@ -876,7 +882,7 @@ case 's': size = atoi( optarg ); - if ( size <= 0 ) + if ( size < 0 ) size = 1; break; @@ -918,17 +924,20 @@ if ( get_face( &face ) ) goto Exit; - if ( FT_IS_SCALABLE( face ) ) + if ( size ) { - if ( FT_Set_Pixel_Sizes( face, size, size ) ) + if ( FT_IS_SCALABLE( face ) ) { - fprintf( stderr, "failed to set pixel size to %d\n", size ); + if ( FT_Set_Pixel_Sizes( face, size, size ) ) + { + fprintf( stderr, "failed to set pixel size to %d\n", size ); - return 1; + return 1; + } } + else + size = face->available_sizes[0].width; } - else - size = face->available_sizes[0].width; FTC_Manager_New( lib, 0, @@ -1020,7 +1029,10 @@ test.title = "Load (sbit cached)"; test.bench = test_sbit_cache; - benchmark( face, &test, max_iter, max_time ); + if ( size ) + benchmark( face, &test, max_iter, max_time ); + else + printf( " %-25s disabled (size = 0)\n", test.title ); } break; @@ -1041,7 +1053,10 @@ case FT_BENCH_RENDER: test.title = "Render"; test.bench = test_render; - benchmark( face, &test, max_iter, max_time ); + if ( size ) + benchmark( face, &test, max_iter, max_time ); + else + printf( " %-25s disabled (size = 0)\n", test.title ); break; case FT_BENCH_GET_GLYPH: @@ -1107,7 +1122,10 @@ case FT_BENCH_EMBOLDEN: test.title = "Embolden"; test.bench = test_embolden; - benchmark( face, &test, max_iter, max_time ); + if ( size ) + benchmark( face, &test, max_iter, max_time ); + else + printf( " %-25s disabled (size = 0)\n", test.title ); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftdiff.1 new/ft2demos-2.5.3/src/ftdiff.1 --- old/ft2demos-2.5.2/src/ftdiff.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftdiff.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTDIFF 1 "December 2013" "FreeType 2.5.2" +.TH FTDIFF 1 "March 2013" "FreeType 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftdump.1 new/ft2demos-2.5.3/src/ftdump.1 --- old/ft2demos-2.5.2/src/ftdump.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftdump.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTDUMP 1 "December 2013" "FreeType 2.5.2" +.TH FTDUMP 1 "March 2013" "FreeType 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftgamma.1 new/ft2demos-2.5.3/src/ftgamma.1 --- old/ft2demos-2.5.2/src/ftgamma.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftgamma.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTGAMMA 1 "December 2013" "FreeType 2.5.2" +.TH FTGAMMA 1 "March 2013" "FreeType 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftgrid.1 new/ft2demos-2.5.3/src/ftgrid.1 --- old/ft2demos-2.5.2/src/ftgrid.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftgrid.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTGRID 1 "December 2013" "Freetype 2.5.2" +.TH FTGRID 1 "March 2013" "Freetype 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftgrid.c new/ft2demos-2.5.3/src/ftgrid.c --- old/ft2demos-2.5.2/src/ftgrid.c 2013-11-27 10:20:46.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftgrid.c 2014-01-28 09:39:44.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2000, 2003-2007, 2009-2013 by */ +/* Copyright 1996-2000, 2003-2007, 2009-2014 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -79,7 +79,9 @@ af_glyph_hints_get_segment_offset( AF_GlyphHints hints, FT_Int dimension, FT_Int idx, - FT_Pos* offset ); + FT_Pos *offset, + FT_Bool *is_blue, + FT_Pos *blue_offset ); #ifdef __cplusplus } #endif @@ -113,9 +115,9 @@ grColor grid_color; grColor outline_color; grColor on_color; - grColor conic_color; - grColor cubic_color; + grColor off_color; grColor segment_color; + grColor blue_color; int do_horz_hints; int do_vert_hints; @@ -168,13 +170,13 @@ st->disp_height = display->bitmap->rows; st->disp_bitmap = display->bitmap; - st->axis_color = grFindColor( display->bitmap, 0, 0, 0, 255 ); - st->grid_color = grFindColor( display->bitmap, 192, 192, 192, 255 ); - st->outline_color = grFindColor( display->bitmap, 255, 0, 0, 255 ); - st->on_color = grFindColor( display->bitmap, 64, 64, 255, 255 ); - st->conic_color = grFindColor( display->bitmap, 0, 128, 0, 255 ); - st->cubic_color = grFindColor( display->bitmap, 255, 64, 255, 255 ); - st->segment_color = grFindColor( display->bitmap, 64, 255, 128, 64 ); + st->axis_color = grFindColor( display->bitmap, 0, 0, 0, 255 ); /* black */ + st->grid_color = grFindColor( display->bitmap, 192, 192, 192, 255 ); /* gray */ + st->outline_color = grFindColor( display->bitmap, 255, 0, 0, 255 ); /* red */ + st->on_color = grFindColor( display->bitmap, 255, 0, 0, 255 ); /* red */ + st->off_color = grFindColor( display->bitmap, 0, 128, 0, 255 ); /* dark green */ + st->segment_color = grFindColor( display->bitmap, 64, 255, 128, 64 ); /* light green */ + st->blue_color = grFindColor( display->bitmap, 64, 64, 255, 64 ); /* light blue */ } @@ -203,12 +205,15 @@ xmax = ( xmax + 63 ) & ~63; ymax = ( ymax + 63 ) & ~63; - printf( "XXX x_ppem=%d y_ppem=%d width=%d height=%d\n", - size->metrics.x_ppem, size->metrics.y_ppem, - xmax - xmin, ymax - ymin ); + if ( xmax - xmin ) + x_scale = st->disp_width * ( 1.0 - 2 * st->margin ) / ( xmax - xmin ); + else + x_scale = 1.0; - x_scale = st->disp_width * ( 1.0 - 2 * st->margin ) / ( xmax - xmin ); - y_scale = st->disp_height * ( 1.0 - 2 * st->margin ) / ( ymax - ymin ); + if ( ymax - ymin ) + y_scale = st->disp_height * ( 1.0 - 2 * st->margin ) / ( ymax - ymin ); + else + y_scale = 1.0; if ( x_scale <= y_scale ) st->scale = x_scale; @@ -290,12 +295,15 @@ for ( count = 0; count < num_seg; count++ ) { - int pos; - FT_Pos offset; + int pos; + FT_Pos offset; + FT_Bool is_blue; + FT_Pos blue_offset; af_glyph_hints_get_segment_offset( hints, dimension, - count, &offset ); + count, &offset, + &is_blue, &blue_offset); if ( dimension == 0 ) /* AF_DIMENSION_HORZ is 0 */ { @@ -306,8 +314,26 @@ else { pos = y_org - (int)offset * st->scale; - grFillHLine( st->disp_bitmap, 0, pos, - st->disp_width, st->segment_color ); + + if ( is_blue ) + { + int blue_pos = y_org - (int)blue_offset * st->scale; + + + if ( blue_pos == pos ) + grFillHLine( st->disp_bitmap, 0, blue_pos, + st->disp_width, st->blue_color ); + else + { + grFillHLine( st->disp_bitmap, 0, blue_pos, + st->disp_width, st->blue_color ); + grFillHLine( st->disp_bitmap, 0, pos, + st->disp_width, st->segment_color ); + } + } + else + grFillHLine( st->disp_bitmap, 0, pos, + st->disp_width, st->segment_color ); } } } @@ -566,7 +592,7 @@ handle, display, ( gimage->tags[nn] & FT_CURVE_TAG_ON ) ? st->on_color - : st->conic_color ); + : st->off_color ); } } } @@ -624,7 +650,7 @@ grWriteln( "i, k move grid up/down V toggle vert. hinting " ); grWriteln( "j, l move grid left/right B toggle blue zone hinting" ); grWriteln( "PgUp, PgDn zoom in/out grid s toggle segment drawing " ); - grWriteln( "SPC reset zoom and position " ); + grWriteln( "SPC reset zoom and position (unfitted, with blues) " ); grWriteln( " 1 dump edge hints " ); grWriteln( "p, n previous/next font 2 dump segment hints " ); grWriteln( " 3 dump point hints " ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftlint.1 new/ft2demos-2.5.3/src/ftlint.1 --- old/ft2demos-2.5.2/src/ftlint.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftlint.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTLINT 1 "December 2013" "Freetype 2.5.2" +.TH FTLINT 1 "March 2013" "Freetype 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftmulti.1 new/ft2demos-2.5.3/src/ftmulti.1 --- old/ft2demos-2.5.2/src/ftmulti.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftmulti.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTMULTI 1 "December 2013" "Freetype 2.5.2" +.TH FTMULTI 1 "March 2013" "Freetype 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftstring.1 new/ft2demos-2.5.3/src/ftstring.1 --- old/ft2demos-2.5.2/src/ftstring.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftstring.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTSTRING 1 "December 2013" "Freetype 2.5.2" +.TH FTSTRING 1 "March 2013" "Freetype 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/fttry.c new/ft2demos-2.5.3/src/fttry.c --- old/ft2demos-2.5.2/src/fttry.c 2013-11-21 06:36:17.000000000 +0100 +++ new/ft2demos-2.5.3/src/fttry.c 2014-01-30 06:23:45.000000000 +0100 @@ -12,6 +12,7 @@ /* */ /****************************************************************************/ + #include <ft2build.h> #include FT_FREETYPE_H @@ -20,14 +21,15 @@ #include <string.h> -#define DUMP_NAME +#define DUMP_NAME #define gettext( x ) ( x ) - FT_Error error; - FT_Library library; - FT_Face face; + FT_Error error; + + FT_Library library; + FT_Face face; unsigned int num_glyphs; int ptsize; @@ -36,8 +38,8 @@ int Num; - - static void Usage( char* name ) + static void + Usage( char* name ) { printf( "fttry: simple TrueType instruction tester -- part of the FreeType project\n" ); printf( "--------------------------------------------------------------------------\n" ); @@ -50,20 +52,26 @@ } - static void Panic( const char* message ) + static void + Panic( const char* message ) { - fprintf( stderr, "%s\n error code = 0x%04x\n", message, error ); - exit(1); + fprintf( stderr, + "%s\n error code = 0x%04x\n", message, error ); + exit( 1 ); } - int main( int argc, char** argv ) + + int + main( int argc, + char** argv ) { - int i, file_index, glyph_index; - char filename[1024 + 4]; - char alt_filename[1024 + 4]; - char* execname; - char* fname; - int load_unscaled = 0; + int i, file_index, glyph_index; + char filename[1024 + 4]; + char alt_filename[1024 + 4]; + char* execname; + char* fname; + int load_unscaled = 0; + execname = argv[0]; @@ -72,9 +80,7 @@ if ( argv[1][0] == '-' && argv[1][1] == 'u' ) - { load_unscaled = 1; - } else { if ( sscanf( argv[1], "%d", &ptsize ) != 1 ) @@ -87,7 +93,8 @@ Usage( execname ); error = FT_Init_FreeType( &library ); - if (error) Panic( "Could not create library object" ); + if ( error ) + Panic( "Could not create library object" ); /* Now check all files */ for ( file_index = 2; file_index < argc; file_index++ ) @@ -120,7 +127,7 @@ if ( filename[i] == '/' || filename[i] == '\\' ) { fname = filename + i + 1; - i = -1; + i = -1; } else i--; @@ -129,19 +136,21 @@ /* Load face */ error = FT_New_Face( library, filename, 0, &face ); - if (error) Panic( "Could not create face object" ); + if ( error ) + Panic( "Could not create face object" ); num_glyphs = face->num_glyphs; error = FT_Set_Char_Size( face, ptsize << 6, 0, 0, 0 ); - if (error) Panic( "Could not set character size" ); + if ( error ) + Panic( "Could not set character size" ); #ifdef DUMP_NAME { char name[1024]; error = FT_Get_Glyph_Name( face, glyph_index, name, 1024 ); - if (error) + if ( error ) printf( "no glyph name available\n" ); else printf( "glyph name = '%s'\n", name ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftvalid.1 new/ft2demos-2.5.3/src/ftvalid.1 --- old/ft2demos-2.5.2/src/ftvalid.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftvalid.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTVALID 1 "December 2013" "FreeType 2.5.2" +.TH FTVALID 1 "March 2013" "FreeType 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ftview.1 new/ft2demos-2.5.3/src/ftview.1 --- old/ft2demos-2.5.2/src/ftview.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ftview.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH FTVIEW 1 "December 2013" "FreeType 2.5.2" +.TH FTVIEW 1 "March 2013" "FreeType 2.5.3" . . .SH NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.5.2/src/ttdebug.1 new/ft2demos-2.5.3/src/ttdebug.1 --- old/ft2demos-2.5.2/src/ttdebug.1 2013-12-08 23:37:12.000000000 +0100 +++ new/ft2demos-2.5.3/src/ttdebug.1 2014-03-06 23:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH TTDEBUG 1 "December 2013" "FreeType 2.5.2" +.TH TTDEBUG 1 "March 2013" "FreeType 2.5.3" . . .SH NAME -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
