[cairo-commit] src/cairo-type1-subset.c

[Adrian Johnson]

 src/cairo-type1-subset.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 0d5f63755e7ceb1bb5678fcf1f4661f3435470fb
Author: David Maxwell <damaxwell at alaska.edu>
Date:   Sun Oct 7 00:01:53 2012 -0800

    type1-subset: always subset subroutines 0-3 (Flex/hint replacement)
    
    http://lists.cairographics.org/archives/cairo/2012-October/023576.html

diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
index ba0b229..56e659a 100644
--- a/src/cairo-type1-subset.c
+++ b/src/cairo-type1-subset.c
@@ -1309,6 +1309,12 @@ skip_subrs:
 	    return status;
     }
 
+    /* Always include the first four subroutines in case the Flex/hint mechanism is
+     * being used. */
+    for (j = 0; j < MIN(font->num_subrs, 4); j++) {
+	font->subrs[j].used = TRUE;
+    }
+
     closefile_token = find_token (dict_end, font->cleartext_end, "closefile");
     if (closefile_token == NULL)
 	return CAIRO_INT_STATUS_UNSUPPORTED;