From owner-svn-ports-head@freebsd.org Mon May 23 03:49:34 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7E1CB46900; Mon, 23 May 2016 03:49:34 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71C1214B0; Mon, 23 May 2016 03:49:34 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4N3nXDk050438; Mon, 23 May 2016 03:49:33 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4N3nX9c050436; Mon, 23 May 2016 03:49:33 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201605230349.u4N3nX9c050436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 23 May 2016 03:49:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415652 - in head/graphics/silgraphite: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2016 03:49:34 -0000 Author: sunpoet Date: Mon May 23 03:49:33 2016 New Revision: 415652 URL: https://svnweb.freebsd.org/changeset/ports/415652 Log: - Add LICENSE Added: head/graphics/silgraphite/files/patch-engine-src-font-TtfUtil.cpp - copied unchanged from r415651, head/graphics/silgraphite/files/patch-engine_src_font_TtfUtil.cpp Deleted: head/graphics/silgraphite/files/patch-engine_src_font_TtfUtil.cpp Modified: head/graphics/silgraphite/Makefile Modified: head/graphics/silgraphite/Makefile ============================================================================== --- head/graphics/silgraphite/Makefile Mon May 23 03:49:28 2016 (r415651) +++ head/graphics/silgraphite/Makefile Mon May 23 03:49:33 2016 (r415652) @@ -10,6 +10,13 @@ MASTER_SITES= SF MAINTAINER= sunpoet@FreeBSD.org COMMENT= Font engine for complex non-Roman writing systems +LICENSE= CPL05 LGPL21+ +LICENSE_COMB= dual +LICENSE_FILE_CPL05= ${WRKSRC}/license/License_CPLv05.txt +LICENSE_FILE_LGPL21= ${WRKSRC}/license/License_LGPLv21.txt +LICENSE_NAME_CPL05= Common Public License Version 0.5 +LICENSE_PERMS_CPL05= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + OPTIONS_DEFINE= FREETYPE OPTIONS_DEFAULT=FREETYPE OPTIONS_SUB= yes Copied: head/graphics/silgraphite/files/patch-engine-src-font-TtfUtil.cpp (from r415651, head/graphics/silgraphite/files/patch-engine_src_font_TtfUtil.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/silgraphite/files/patch-engine-src-font-TtfUtil.cpp Mon May 23 03:49:33 2016 (r415652, copy of r415651, head/graphics/silgraphite/files/patch-engine_src_font_TtfUtil.cpp) @@ -0,0 +1,20 @@ +--- engine/src/font/TtfUtil.cpp.orig 2009-01-29 08:33:19 UTC ++++ engine/src/font/TtfUtil.cpp +@@ -1106,7 +1106,7 @@ size_t LocaLookup(gr::gid16 nGlyphId, + // CheckTable verifies the index_to_loc_format is valid + if (read(pTable->index_to_loc_format) == Sfnt::FontHeader::ShortIndexLocFormat) + { // loca entries are two bytes and have been divided by two +- if (nGlyphId <= (lLocaSize >> 1) - 1) // allow sentinel value to be accessed ++ if (lLocaSize >= 2 && nGlyphId <= (lLocaSize >> 1) - 1) // allow sentinel value to be accessed + { + const uint16 * pTable = reinterpret_cast(pLoca); + return (read(pTable[nGlyphId]) << 1); +@@ -1115,7 +1115,7 @@ size_t LocaLookup(gr::gid16 nGlyphId, + + if (read(pTable->index_to_loc_format) == Sfnt::FontHeader::LongIndexLocFormat) + { // loca entries are four bytes +- if (nGlyphId <= (lLocaSize >> 2) - 1) ++ if (lLocaSize >= 4 && nGlyphId <= (lLocaSize >> 2) - 1) + { + const uint32 * pTable = reinterpret_cast(pLoca); + return read(pTable[nGlyphId]);