[gs-cvs] rev 7657 - trunk/gs/src

[leonardo at ghostscript.com]

Author: leonardo
Date: 2007-01-30 16:09:21 -0800 (Tue, 30 Jan 2007)
New Revision: 7657

Modified:
   trunk/gs/src/ttfmain.c
Log:
Fix (True Type renderer) : Allow TTC format 2.

DETAILS :

Patch from Tor Andersson.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/ttfmain.c
===================================================================
--- trunk/gs/src/ttfmain.c	2007-01-30 00:16:34 UTC (rev 7656)
+++ trunk/gs/src/ttfmain.c	2007-01-31 00:09:21 UTC (rev 7657)
@@ -211,7 +211,8 @@
 FontError ttfFont__Open(ttfInterpreter *tti, ttfFont *this, ttfReader *r, 
 				    unsigned int nTTC, float w, float h, 
 				    bool design_grid)
-{   char sVersion[4], sVersion0[4] = {0, 1, 0, 0};
+{   char sVersion[4], sVersion1[4] = {0, 1, 0, 0};
+    char sVersion2[4] = {0, 2, 0, 0};
     unsigned int nNumTables, i;
     TT_Error code;
     int k;
@@ -227,7 +228,7 @@
 	unsigned int nPos = 0xbaadf00d; /* Quiet compiler. */
 
 	r->Read(r, sVersion, 4);
-	if(memcmp(sVersion, sVersion0, 4))
+       if(memcmp(sVersion, sVersion1, 4) && memcmp(sVersion, sVersion2, 4))
 	    return fUnimplemented;
 	nFonts = ttfReader__UInt(r);
 	if (nFonts == 0)
@@ -239,7 +240,7 @@
 	r->Seek(r, nPos);
 	r->Read(r, sVersion, 4);
     }
-    if(memcmp(sVersion, sVersion0, 4) && memcmp(sVersion, "true", 4))
+    if(memcmp(sVersion, sVersion1, 4) && memcmp(sVersion, "true", 4))
 	return fUnimplemented;
     nNumTables    = ttfReader__UShort(r);
     ttfReader__UShort(r); /* nSearchRange */