Attachment 313871 Details for Bug 458476 – half assed patch to get started

[patch] half assed patch to get started

psprint.hacking.patch (text/plain), 2.56 KB, created by Caolan McNamara on 2008-08-09 12:37:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2008-08-09 12:37:55 UTC

Size: 2.56 KB

patch

obsolete

>Index: source/fontsubset/sft.c
>===================================================================
>RCS file: /cvs/gsl/psprint/source/fontsubset/sft.c,v
>retrieving revision 1.45
>diff -u -r1.45 sft.c
>--- source/fontsubset/sft.c	26 Nov 2007 15:06:31 -0000	1.45
>+++ source/fontsubset/sft.c	9 Aug 2008 12:35:30 -0000
>@@ -130,6 +130,7 @@
> 
> static const sal_uInt32 T_true = 0x74727565;        /* 'true' */
> static const sal_uInt32 T_ttcf = 0x74746366;        /* 'ttcf' */
>+static const sal_uInt32 T_otto = 0x4f54544f;        /* 'otto' */
> 
> /* standard TrueType table tags */
> #define T_maxp 0x6D617870
>@@ -1741,22 +1742,27 @@
> 
>     if ((version == 0x00010000) || (version == T_true)) {
>         tdoffset = 0;
>+    } else if (version == T_otto) {                         /*- OTF collection */
>+        tdoffset = 0;
>     } else if (version == T_ttcf) {                         /*- TrueType collection */
>         if (GetUInt32(t->ptr, 4, 1) != 0x00010000) {
>             CloseTTFont(t);
>+	    fprintf(stderr, "failure one\n");
>             return SF_TTFORMAT;
>         }
>         if (facenum >= GetUInt32(t->ptr, 8, 1)) {
>             CloseTTFont(t);
>+	    fprintf(stderr, "failure two\n");
>             return SF_FONTNO;
>         }
>         tdoffset = GetUInt32(t->ptr, 12 + 4 * facenum, 1);
>     } else {
>         CloseTTFont(t);
>+	fprintf(stderr, "failure three version %x\n", version);
>         return SF_TTFORMAT;
>     }
> 
>-#ifdef DEBUG2
>+#if 1
>     fprintf(stderr, "tdoffset: %d\n", tdoffset);
> #endif
> 
>@@ -1865,8 +1880,28 @@
>      * maxp, head, glyf, loca, name, cmap
>      */
> 
>-    if (!(getTable(t, O_maxp) && getTable(t, O_head) && getTable(t, O_glyf) && getTable(t, O_loca) && getTable(t, O_name) && getTable(t, O_cmap) )) {
>+    int bFoo = getTable(t, O_maxp);
>+    fprintf(stderr, "one bFoo is %d\n", bFoo);
>+    bFoo = getTable(t, O_head);
>+    fprintf(stderr, "two bFoo is %d\n", bFoo);
>+    bFoo = getTable(t, O_glyf);
>+    fprintf(stderr, "three bFoo is %d\n", bFoo);
>+    bFoo = getTable(t, O_loca);
>+    fprintf(stderr, "four bFoo is %d\n", bFoo);
>+    bFoo = getTable(t, O_name);
>+    fprintf(stderr, "five bFoo is %d\n", bFoo);
>+    bFoo = getTable(t, O_cmap);
>+    fprintf(stderr, "six bFoo is %d\n", bFoo);
>+    if (!(getTable(t, O_maxp) && getTable(t, O_head) && getTable(t, O_name) && getTable(t, O_cmap) ))
>+    {
>+        CloseTTFont(t);
>+		fprintf(stderr, "failure seven\n");
>+        return SF_TTFORMAT;
>+    }
>+    if (version != T_otto && !(getTable(t, O_glyf) && getTable(t, O_loca)))
>+    {
>         CloseTTFont(t);
>+	fprintf(stderr, "failure seven.2\n");
>         return SF_TTFORMAT;
>     }
>

Actions: View | Diff

Attachments on bug 458476: 313871 | 313875