From 8f3f31a4f4e5093b54782e5e17ad7116021283cf Mon Sep 17 00:00:00 2001 From: Sungyeon Woo Date: Wed, 7 Aug 2013 10:55:06 +0900 Subject: [PATCH] private sync Signed-off-by: Sungyeon Woo --- TC/_export_env.sh | 2 +- {ft2demos => TC/testcase/ft2demos}/ftbench | Bin {ft2demos => TC/testcase/ft2demos}/ftdiff | Bin {ft2demos => TC/testcase/ft2demos}/ftdump | Bin {ft2demos => TC/testcase/ft2demos}/ftgamma | Bin {ft2demos => TC/testcase/ft2demos}/ftgrid | Bin {ft2demos => TC/testcase/ft2demos}/ftlint | Bin {ft2demos => TC/testcase/ft2demos}/ftmulti | Bin {ft2demos => TC/testcase/ft2demos}/ftstring | Bin {ft2demos => TC/testcase/ft2demos}/ftview | Bin debian/changelog | 8 ++++++++ packaging/freetype.spec | 6 +++++- src/bdf/bdflib.c | 11 +++++++++-- 13 files changed, 23 insertions(+), 4 deletions(-) rename {ft2demos => TC/testcase/ft2demos}/ftbench (100%) rename {ft2demos => TC/testcase/ft2demos}/ftdiff (100%) rename {ft2demos => TC/testcase/ft2demos}/ftdump (100%) rename {ft2demos => TC/testcase/ft2demos}/ftgamma (100%) rename {ft2demos => TC/testcase/ft2demos}/ftgrid (100%) rename {ft2demos => TC/testcase/ft2demos}/ftlint (100%) rename {ft2demos => TC/testcase/ft2demos}/ftmulti (100%) rename {ft2demos => TC/testcase/ft2demos}/ftstring (100%) rename {ft2demos => TC/testcase/ft2demos}/ftview (100%) diff --git a/TC/_export_env.sh b/TC/_export_env.sh index 06b6671..2ea67ff 100755 --- a/TC/_export_env.sh +++ b/TC/_export_env.sh @@ -6,4 +6,4 @@ export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target # tetware target path export PATH=$TET_TARGET_PATH/bin:$PATH export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH export TET_ROOT=$TET_TARGET_PATH -export FT2_TC_ROOT_PATH=/mnt/nfs/DTS/freetype/ft2demos +export FT2_TC_ROOT_PATH=/mnt/nfs/DTS/freetype/TC/testcase/ft2demos diff --git a/ft2demos/ftbench b/TC/testcase/ft2demos/ftbench similarity index 100% rename from ft2demos/ftbench rename to TC/testcase/ft2demos/ftbench diff --git a/ft2demos/ftdiff b/TC/testcase/ft2demos/ftdiff similarity index 100% rename from ft2demos/ftdiff rename to TC/testcase/ft2demos/ftdiff diff --git a/ft2demos/ftdump b/TC/testcase/ft2demos/ftdump similarity index 100% rename from ft2demos/ftdump rename to TC/testcase/ft2demos/ftdump diff --git a/ft2demos/ftgamma b/TC/testcase/ft2demos/ftgamma similarity index 100% rename from ft2demos/ftgamma rename to TC/testcase/ft2demos/ftgamma diff --git a/ft2demos/ftgrid b/TC/testcase/ft2demos/ftgrid similarity index 100% rename from ft2demos/ftgrid rename to TC/testcase/ft2demos/ftgrid diff --git a/ft2demos/ftlint b/TC/testcase/ft2demos/ftlint similarity index 100% rename from ft2demos/ftlint rename to TC/testcase/ft2demos/ftlint diff --git a/ft2demos/ftmulti b/TC/testcase/ft2demos/ftmulti similarity index 100% rename from ft2demos/ftmulti rename to TC/testcase/ft2demos/ftmulti diff --git a/ft2demos/ftstring b/TC/testcase/ft2demos/ftstring similarity index 100% rename from ft2demos/ftstring rename to TC/testcase/ft2demos/ftstring diff --git a/ft2demos/ftview b/TC/testcase/ft2demos/ftview similarity index 100% rename from ft2demos/ftview rename to TC/testcase/ft2demos/ftview diff --git a/debian/changelog b/debian/changelog index 13476fd..204253b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +freetype (2.4.9-slp2+4) unstable; urgency=low + + * Add license file + * Git: framework/graphics/freetype + * Tag: freetype_2.4.9-slp2+4 + + -- Seongwon Cho Wed, 10 Oct 2012 20:06:08 +0900 + freetype (2.4.9-slp2+1) unstable; urgency=low * FT2 version upgrade from 2.4.3 to 2.4.9 diff --git a/packaging/freetype.spec b/packaging/freetype.spec index 675e916..c4c60c1 100644 --- a/packaging/freetype.spec +++ b/packaging/freetype.spec @@ -1,7 +1,7 @@ Name: freetype Summary: A free and portable font rendering engine Version: 2.4.9 -Release: 1 +Release: 4 Group: System/Libraries License: FTL or GPLv2+ URL: http://www.freetype.org @@ -53,6 +53,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale +mkdir -p %{buildroot}/usr/share/license +cat docs/FTL.TXT > %{buildroot}/usr/share/license/%{name} # fix multilib issues @@ -93,8 +95,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %manifest freetype.manifest %defattr(-,root,root,-) %{_libdir}/libfreetype.so.* +/usr/share/license/%{name} %files devel +%manifest freetype.manifest %defattr(-,root,root,-) %dir %{_includedir}/freetype2 %{_datadir}/aclocal/freetype2.m4 diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c index b7b6857..9009a5e 100644 --- a/src/bdf/bdflib.c +++ b/src/bdf/bdflib.c @@ -1626,12 +1626,16 @@ if ( p->glyph_enc == -1 && p->list.used > 2 ) p->glyph_enc = _bdf_atol( p->list.field[2], 0, 10 ); + if ( p->glyph_enc < -1 ) + p->glyph_enc = -1; + FT_TRACE4(( DBGMSG2, p->glyph_enc )); /* Check that the encoding is in the Unicode range because */ /* otherwise p->have (a bitmap with static size) overflows. */ if ( p->glyph_enc > 0 && - (size_t)p->glyph_enc >= sizeof ( p->have ) * 8 ) + (size_t)p->glyph_enc >= sizeof ( p->have ) / + sizeof ( unsigned long ) * 32) { FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "ENCODING" )); error = BDF_Err_Invalid_File_Format; @@ -2171,7 +2175,10 @@ p->cnt = p->font->props_size = _bdf_atoul( p->list.field[1], 0, 10 ); if ( FT_NEW_ARRAY( p->font->props, p->cnt ) ) - goto Exit; + { + p->font->props_size = 0; + goto Exit; + } p->flags |= _BDF_PROPS; *next = _bdf_parse_properties; -- 2.7.4