svn commit: r415652 - in head/graphics/silgraphite: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Mon May 23 03:49:34 UTC 2016
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 at 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<const uint16 *>(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<const uint32 *>(pLoca);
+ return read(pTable[nGlyphId]);
More information about the svn-ports-head
mailing list