Attachment #134489 for bug #179177

View | Details | Raw Unified | Return to bug 179177
Collapse All | Expand All




# Created by: Kimura Fuyuki <fuyuki@hadaly.org>
# Date created:                18 May 2004
# Whom:                        Kimura Fuyuki <fuyuki@hadaly.org>
#
# $FreeBSD$
#

PORTNAME=	libotf
PORTVERSION=	0.9.13
CATEGORIES=	print devel
MASTER_SITES=	${MASTER_SITE_SAVANNAH}:m17n
MASTER_SITE_SUBDIR=	m17n

MAINTAINER=	nikola.lecic@anthesphoria.net
COMMENT=	Library for handling OpenType fonts

LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2

USE_XORG=	x11 xt xaw xmu
USE_PKGCONFIG=	yes
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
CPPFLAGS+=	-I${LOCALBASE}/include

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (libotf-0.9.12.tar.gz) = a4a04cccf84955242202a4a7e50314259030c1f1573675085ba1c5a95b529297	1	SHA256 (libotf-0.9.13.tar.gz) = 7bc466ba50425f95b52de12b4ad35320acefcef13ce67bf33edc14abdcfe6908
2	SIZE (libotf-0.9.12.tar.gz) = 363974	2	SIZE (libotf-0.9.13.tar.gz) = 388832




--- example/otfdump.c	19 Mar 2010 12:27:02 -0000	1.27
+++ example/otfdump.c	11 Feb 2011 02:52:37 -0000	1.28
@@ -32,12 +32,8 @@
 
 #include <otf.h>
 
-char *indent_spaces[] =
-  { "", "  ", "    ", "      ", "        ", "          ", "            ",
-    "              ",  "                ",  "                  " };
-
 /* Indented print.  */
-#define IPRINT printf("\n%s", indent_spaces[indent]), printf
+#define IPRINT printf("\n%*s", indent * 2, ""), printf
 
 static void
 dump_tag (OTF_Tag tag)
@@ -457,6 +453,8 @@
 static void
 dump_anchor (int indent, OTF_Anchor *anchor)
 {
+  if (anchor->offset == 0)
+    return;
   IPRINT ("(Anchor (offset #x%04X) (AnchorFormat %d)",
 	  anchor->offset, anchor->AnchorFormat);
   indent++;




--- src/otfopen.c	22 Sep 2010 03:46:17 -0000	1.62
+++ src/otfopen.c	11 Feb 2011 02:55:05 -0000	1.63
@@ -2336,8 +2336,9 @@
     }
   for (i = 0; i < array->Count; i++)
     for (j = 0; j < ClassCount; j++)
-      if (read_anchor (otf, stream, offset + array->offset,
-		       &array->AnchorRecord[i].Anchor[j]) < 0)
+      if (array->AnchorRecord[i].Anchor[j].offset > 0
+	  && read_anchor (otf, stream, offset + array->offset,
+			  &array->AnchorRecord[i].Anchor[j]) < 0)
 	return -1;
   RESTORE_STREAM (stream, state);
   return 0;
@@ -2437,7 +2438,7 @@
 		      unsigned ClassCount, OTF_LigatureAttach *attach)
 {
   char *errfmt = "LigatureAttach%s";
-  int errret = 1;
+  int errret = -1;
   int i, j;
 
   SEEK_STREAM (stream, offset + attach->offset);
@@ -2483,8 +2484,10 @@
   for (i = 0; i < array->LigatureCount; i++)
     READ_OFFSET (stream, array->LigatureAttach[i].offset);
   for (i = 0; i < array->LigatureCount; i++)
-    read_ligature_attach (otf, stream, offset + array->offset,
-			  class_count, array->LigatureAttach + i);
+    if (array->LigatureAttach[i].offset > 0
+	&& read_ligature_attach (otf, stream, offset + array->offset,
+				 class_count, array->LigatureAttach + i) < 0)
+      return -1;
   RESTORE_STREAM (stream, state);
   return 0;
 }
@@ -2625,7 +2628,7 @@
 	  read_coverage (otf, stream, offset, &subtable->Coverage);
 	  read_coverage (otf, stream, offset,
 			 &subtable->u.mark_mark1.Mark2Coverage);
-	  READ_UINT16 (stream, subtable->u.mark_base1.ClassCount);
+	  READ_UINT16 (stream, subtable->u.mark_mark1.ClassCount);
 	  read_mark_array (otf, stream, offset,
 			   &subtable->u.mark_mark1.Mark1Array);
 	  read_anchor_array (otf, stream, offset,

Lines 9-12 Link Here

(-)pkg-descr (-1 / +1 lines)
9	The combination of libotf and the FreeType library (Ver. 2) realizes	9	The combination of libotf and the FreeType library (Ver. 2) realizes
10	CTL (complex text layout) by OpenType fonts.	10	CTL (complex text layout) by OpenType fonts.
11		11
12	WWW: http://www.m17n.org/libotf/	12	WWW: http://www.nongnu.org/m17n/

Return to bug 179177

Lines 1-15 Link Here

(-)Makefile (-9 / +5 lines)
1	# New ports collection makefile for: libotf	1	# Created by: Kimura Fuyuki <fuyuki@hadaly.org>
2	# Date created: 18 May 2004
3	# Whom: Kimura Fuyuki <fuyuki@hadaly.org>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= libotf	4	PORTNAME= libotf
9	PORTVERSION= 0.9.12	5	PORTVERSION= 0.9.13
10	CATEGORIES= print devel	6	CATEGORIES= print devel
11	MASTER_SITES= http://www.m17n.org/libotf/ \	7	MASTER_SITES= ${MASTER_SITE_SAVANNAH}:m17n
12	http://anthesphoria.net/FreeBSD/ports/distfiles/	8	MASTER_SITE_SUBDIR= m17n
13		9
14	MAINTAINER= nikola.lecic@anthesphoria.net	10	MAINTAINER= nikola.lecic@anthesphoria.net
15	COMMENT= Library for handling OpenType fonts	11	COMMENT= Library for handling OpenType fonts
Lines 17-23 Link Here
17	LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2	13	LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
18		14
19	USE_XORG= x11 xt xaw xmu	15	USE_XORG= x11 xt xaw xmu
20	USE_GNOME= pkgconfig	16	USE_PKGCONFIG= yes
21	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
22	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
23	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include

Lines 1-25 Link Here

(-)files/patch-example_otfdump.c (-25 lines)
1	--- example/otfdump.c 19 Mar 2010 12:27:02 -0000 1.27
2	+++ example/otfdump.c 11 Feb 2011 02:52:37 -0000 1.28
3	@@ -32,12 +32,8 @@
4
5	#include <otf.h>
6
7	-char *indent_spaces[] =
8	- { "", " ", " ", " ", " ", " ", " ",
9	- " ", " ", " " };
10	-
11	/* Indented print. */
12	-#define IPRINT printf("\n%s", indent_spaces[indent]), printf
13	+#define IPRINT printf("\n%s", indent 2, ""), printf
14
15	static void
16	dump_tag (OTF_Tag tag)
17	@@ -457,6 +453,8 @@
18	static void
19	dump_anchor (int indent, OTF_Anchor *anchor)
20	{
21	+ if (anchor->offset == 0)
22	+ return;
23	IPRINT ("(Anchor (offset #x%04X) (AnchorFormat %d)",
24	anchor->offset, anchor->AnchorFormat);
25	indent++;

Lines 1-45 Link Here

(-)files/patch-src_otfopen.c (-45 lines)
1	--- src/otfopen.c 22 Sep 2010 03:46:17 -0000 1.62
2	+++ src/otfopen.c 11 Feb 2011 02:55:05 -0000 1.63
3	@@ -2336,8 +2336,9 @@
4	}
5	for (i = 0; i < array->Count; i++)
6	for (j = 0; j < ClassCount; j++)
7	- if (read_anchor (otf, stream, offset + array->offset,
8	- &array->AnchorRecord[i].Anchor[j]) < 0)
9	+ if (array->AnchorRecord[i].Anchor[j].offset > 0
10	+ && read_anchor (otf, stream, offset + array->offset,
11	+ &array->AnchorRecord[i].Anchor[j]) < 0)
12	return -1;
13	RESTORE_STREAM (stream, state);
14	return 0;
15	@@ -2437,7 +2438,7 @@
16	unsigned ClassCount, OTF_LigatureAttach *attach)
17	{
18	char *errfmt = "LigatureAttach%s";
19	- int errret = 1;
20	+ int errret = -1;
21	int i, j;
22
23	SEEK_STREAM (stream, offset + attach->offset);
24	@@ -2483,8 +2484,10 @@
25	for (i = 0; i < array->LigatureCount; i++)
26	READ_OFFSET (stream, array->LigatureAttach[i].offset);
27	for (i = 0; i < array->LigatureCount; i++)
28	- read_ligature_attach (otf, stream, offset + array->offset,
29	- class_count, array->LigatureAttach + i);
30	+ if (array->LigatureAttach[i].offset > 0
31	+ && read_ligature_attach (otf, stream, offset + array->offset,
32	+ class_count, array->LigatureAttach + i) < 0)
33	+ return -1;
34	RESTORE_STREAM (stream, state);
35	return 0;
36	}
37	@@ -2625,7 +2628,7 @@
38	read_coverage (otf, stream, offset, &subtable->Coverage);
39	read_coverage (otf, stream, offset,
40	&subtable->u.mark_mark1.Mark2Coverage);
41	- READ_UINT16 (stream, subtable->u.mark_base1.ClassCount);
42	+ READ_UINT16 (stream, subtable->u.mark_mark1.ClassCount);
43	read_mark_array (otf, stream, offset,
44	&subtable->u.mark_mark1.Mark1Array);
45	read_anchor_array (otf, stream, offset,